diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
index 74a0742..8dd44ce 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -48,6 +48,10 @@ extends:
     stages:
     - stage: stage
       jobs:
+      - name: Install WinGet
+        uses: Cyberboss/install-winget@v1
+      - run: winget upgrade --id Microsoft.VisualStudio.2022.Enterprise
+        continue-on-error: false
       - job: Build
         displayName: 'Build'
         timeoutInMinutes: 120
diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj
index d99ebae..2023699 100644
--- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj
+++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj
@@ -6,12 +6,6 @@
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <RootNamespace>Microsoft.Xaml.Interactivity</RootNamespace>
     <UseUwp>true</UseUwp>
-
-    <!--
-      Temporary workaround to enable building on Visual Studio 17.11,
-      this can be removed on 17.12 as it will be set automatically.
-    -->
-    <UseUwpTools>true</UseUwpTools>
     <DefaultLanguage>en-US</DefaultLanguage>
     <Platforms>AnyCPU;x86;x64;arm64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>