[main] Update dependencies from dotnet/arcade (#5733)

[main] Update dependencies from dotnet/arcade - Update image used; it seems the GA 6.0.100 .NET Core SDK wants VS 2022 for WPF's purposes. - Temporarily change to Int pools for verification - Revert "Temporarily change to Int pools for verification" This reverts commit 266cd39779. - Change platform Toolset to 143 - Merge branch 'darc-main-83d344b6-2da4-4cb4-bc09-b0c292dfa886' of https://github.com/dotnet/wpf into darc-main-83d344b6-2da4-4cb4-bc09-b0c292dfa886 - Update VCRuntime VC version - Temporarily change pool to internal - Change toolsversion to 17 - temporarily remove atl lib dependency
2021-12-11 13:48:58 +00:00 · 2021-12-11 13:48:58 +00:00 · 82383246cc
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -73,7 +73,7 @@ stages:
        # agent pool can't be read from a user-defined variable (Azure DevOps limitation)
        pool:
          name: NetCore1ESPool-Internal
-          demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
+          demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
        # runAsPublic is used in expressions, which can't read from user-defined variables
        runAsPublic: false

--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -75,25 +75,25 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21610.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21610.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21610.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21610.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21610.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
    </Dependency>
  </ToolsetDependencies>
 </Dependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -37,9 +37,9 @@
  </PropertyGroup>
  <!-- Packages that come from https://github.com/dotnet/arcade -->
  <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.21569.2</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21569.2</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>7.0.0-beta.21569.2</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.21610.4</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21610.4</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>7.0.0-beta.21610.4</MicrosoftDotNetGenAPIVersion>
  </PropertyGroup>
  <!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
  <!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@ -4,7 +4,7 @@
    <CharacterSet>Unicode</CharacterSet>

    <!-- v142 = Visual Studio 2019 -->
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>

    <!-- 17134 is Windows 10 v1903 (19H1) SDK -->
    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@ -187,10 +187,6 @@ function InitializeCustomToolset {
 }

 function Build {
-
-  if [[ "$ci" == true ]]; then
-    TryLogClientIpAddress
-  fi
  InitializeToolset
  InitializeCustomToolset

--- a/eng/common/cross/armv6/sources.list.buster
+++ b/eng/common/cross/armv6/sources.list.buster
@ -0,0 +1,2 @@
+deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
+deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@ -99,6 +99,15 @@ while :; do
            __AlpineArch=armv7
            __QEMUArch=arm
            ;;
+        armv6)
+            __BuildArch=armv6
+            __UbuntuArch=armhf
+            __QEMUArch=arm
+            __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
+            __CodeName=buster
+            __LLDB_Package="liblldb-6.0-dev"
+            __Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg"
+            ;;
        arm64)
            __BuildArch=arm64
            __UbuntuArch=arm64
@ -236,6 +245,12 @@ while :; do
    shift
 done

+if [ -e "$__Keyring" ]; then
+    __Keyring="--keyring=$__Keyring"
+else
+    __Keyring=""
+fi
+
 if [ "$__BuildArch" == "armel" ]; then
    __LLDB_Package="lldb-3.5-dev"
 fi
@ -337,7 +352,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
    wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
    wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
 elif [[ -n $__CodeName ]]; then
-    qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
+    qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
    cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
    chroot $__RootfsDir apt-get update
    chroot $__RootfsDir apt-get -f -y install
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@ -2,6 +2,7 @@
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
+# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! 

 if [[ "$#" -lt 3 ]]; then
  echo "Usage..."
@ -111,12 +112,10 @@ if [[ -z "$CC" ]]; then
    exit 1
 fi

-if [[ "$compiler" == "clang" ]]; then
-    if command -v "lld$desired_version" > /dev/null; then
-        # Only lld version >= 9 can be considered stable
-        if [[ "$majorVersion" -ge 9 ]]; then
-            LDFLAGS="-fuse-ld=lld"
-        fi
+# Only lld version >= 9 can be considered stable
+if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
+    if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
+        LDFLAGS="-fuse-ld=lld"
    fi
 fi

--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@ -83,9 +83,6 @@ try {
  }

  if ($restore) {
-    if ($ci) {
-      Try-LogClientIpAddress
-    }
    Build 'Restore'
  }

--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
 </packages>
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@ -51,14 +51,9 @@ jobs:
      value: ${{ parameters.AzDOPipelineId }}
    - name: AzDOBuildId
      value: ${{ parameters.AzDOBuildId }}
-    # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
-    # sync with the packages.config file.
-    - name: DefaultGuardianVersion
-      value: 0.53.3
+    - template: /eng/common/templates/variables/sdl-variables.yml
    - name: GuardianVersion
      value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
-    - name: GuardianPackagesConfigFile
-      value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
  pool:
    vmImage: windows-2019
  steps:
@ -125,57 +120,11 @@ jobs:
      displayName: Extract Archive Artifacts
      continueOnError: ${{ parameters.sdlContinueOnError }}
  
-  - ${{ if ne(parameters.overrideGuardianVersion, '') }}:
-    - powershell: |
-        $content = Get-Content $(GuardianPackagesConfigFile)
-
-        Write-Host "packages.config content was:`n$content"
-
-        $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
-        $content | Set-Content $(GuardianPackagesConfigFile)
-
-        Write-Host "packages.config content updated to:`n$content"
-      displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
-
-  - task: NuGetToolInstaller@1
-    displayName: 'Install NuGet.exe'
-  - task: NuGetCommand@2
-    displayName: 'Install Guardian'
-    inputs:
-      restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
-      feedsToUse: config
-      nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
-      externalFeedCredentials: GuardianConnect
-      restoreDirectory: $(Build.SourcesDirectory)\.packages
-
-  - ${{ if ne(parameters.overrideParameters, '') }}:
-    - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-  - ${{ if eq(parameters.overrideParameters, '') }}:
-    - powershell: ${{ parameters.executeAllSdlToolsScript }}
-        -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
-        -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-        -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
-        ${{ parameters.additionalParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-
-  - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
-    # We want to publish the Guardian results and configuration for easy diagnosis. However, the
-    # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
-    # tooling files. Some of these files are large and aren't useful during an investigation, so
-    # exclude them by simply deleting them before publishing. (As of writing, there is no documented
-    # way to selectively exclude a dir from the pipeline artifact publish task.)
-    - task: DeleteFiles@1
-      displayName: Delete Guardian dependencies to avoid uploading
-      inputs:
-        SourceFolder: $(Agent.BuildDirectory)/.gdn
-        Contents: |
-          c
-          i
-      condition: succeededOrFailed()
-    - publish: $(Agent.BuildDirectory)/.gdn
-      artifact: GuardianConfiguration
-      displayName: Publish GuardianConfiguration
-      condition: succeededOrFailed()
+  - template: /eng/common/templates/steps/execute-sdl.yml
+    parameters:
+      overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+      executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+      overrideParameters: ${{ parameters.overrideParameters }}
+      additionalParameters: ${{ parameters.additionalParameters }}
+      publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+      sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@ -114,6 +114,7 @@ jobs:
        continueOnError: ${{ parameters.continueOnError }}
        condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))

+  - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
    - task: NuGetAuthenticate@0

  - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
--- a/eng/common/templates/steps/execute-sdl.yml
+++ b/eng/common/templates/steps/execute-sdl.yml
@ -0,0 +1,68 @@
+parameters:
+  overrideGuardianVersion: ''
+  executeAllSdlToolsScript: ''
+  overrideParameters: ''
+  additionalParameters: ''
+  publishGuardianDirectoryToPipeline: false
+  sdlContinueOnError: false
+  condition: ''
+
+steps:
+- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
+  - powershell: |
+      $content = Get-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content was:`n$content"
+
+      $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
+      $content | Set-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content updated to:`n$content"
+    displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
+
+- task: NuGetToolInstaller@1
+  displayName: 'Install NuGet.exe'
+  
+- task: NuGetCommand@2
+  displayName: 'Install Guardian'
+  inputs:
+    restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+    feedsToUse: config
+    nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
+    externalFeedCredentials: GuardianConnect
+    restoreDirectory: $(Build.SourcesDirectory)\.packages
+
+- ${{ if ne(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if eq(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }}
+      -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
+      -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
+      -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
+      ${{ parameters.additionalParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
+  # We want to publish the Guardian results and configuration for easy diagnosis. However, the
+  # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
+  # tooling files. Some of these files are large and aren't useful during an investigation, so
+  # exclude them by simply deleting them before publishing. (As of writing, there is no documented
+  # way to selectively exclude a dir from the pipeline artifact publish task.)
+  - task: DeleteFiles@1
+    displayName: Delete Guardian dependencies to avoid uploading
+    inputs:
+      SourceFolder: $(Agent.BuildDirectory)/.gdn
+      Contents: |
+        c
+        i
+    condition: succeededOrFailed()
+  - publish: $(Agent.BuildDirectory)/.gdn
+    artifact: GuardianConfiguration
+    displayName: Publish GuardianConfiguration
+    condition: succeededOrFailed()
--- a/eng/common/templates/variables/sdl-variables.yml
+++ b/eng/common/templates/variables/sdl-variables.yml
@ -0,0 +1,7 @@
+variables:
+# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+# sync with the packages.config file.
+- name: DefaultGuardianVersion
+  value: 0.109.0
+- name: GuardianPackagesConfigFile
+  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
  # Disable telemetry on CI.
  if ($ci) {
    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
- 
-    # In case of network error, try to log the current IP for reference
-    Try-LogClientIpAddress
  }

  # Source Build uses DotNetCoreSdkDir variable
@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) {
  }
 }

-function Try-LogClientIpAddress()
-{
-    Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
-    try
-    {
-        $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
-        $lines = $result.Content.Split([Environment]::NewLine) 
-        $socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
-        Write-Host $socketIp
-        $clientIp = $lines | Select-String -Pattern "^Client IP:.*"
-        Write-Host $clientIp
-    }
-    catch
-    {
-        Write-Host "Unable to get this machine's effective IP address for logging: $_"
-    }
-}
-
 #
 # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
 #
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@ -178,7 +178,7 @@ function InstallDotNetSdk {
  if [[ $# -ge 3 ]]; then
    architecture=$3
  fi
-  InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key
+  InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key
 }

 function InstallDotNet {
@ -405,13 +405,6 @@ function StopProcesses {
  return 0
 }

-function TryLogClientIpAddress () {
-  echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
-  if command -v curl > /dev/null; then
-    curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
-  fi
-}
-
 function MSBuild {
  local args=$@
  if [[ "$pipelines_log" == true ]]; then
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@ -34,11 +34,11 @@ jobs:
        # Will eventually change this to two BYOC pools.
        # agent pool can't be read from a user-defined variable (Azure DevOps limitation)
        ${{ if eq(variables['System.TeamProject'], 'public') }}:
-          name: NetCore1ESPool-Public
-          demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
+          name: NetCore1ESPool-Public-Int
+          demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          name: NetCore1ESPool-Internal
-          demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
+          name: NetCore1ESPool-Internal-Int
+          demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
      variables:
        # needed for signing
        - name: _TeamName
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "tools": {
-    "dotnet": "6.0.100-rc.1.21430.12",
+    "dotnet": "6.0.100",
    "runtimes": {
      "dotnet": [
        "2.1.7",
@ -12,11 +12,11 @@
    }
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21610.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21610.4"
  },
  "sdk": {
-    "version": "6.0.100-rc.1.21430.12"
+    "version": "6.0.100"
  },
  "native-tools": {
    "strawberry-perl": "5.28.1.1-1",
--- a/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj
@ -33,8 +33,8 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(WpfCppProps)" />
  <PropertyGroup>
-    <VCRedistCrtFolderName Condition="'$(Configuration)'=='Release'">Microsoft.VC142.CRT</VCRedistCrtFolderName>
-    <VCRedistCrtFolderName Condition="'$(Configuration)'=='Debug'">Microsoft.VC142.DebugCRT</VCRedistCrtFolderName>
+    <VCRedistCrtFolderName Condition="'$(Configuration)'=='Release'">Microsoft.VC143.CRT</VCRedistCrtFolderName>
+    <VCRedistCrtFolderName Condition="'$(Configuration)'=='Debug'">Microsoft.VC143.DebugCRT</VCRedistCrtFolderName>
    <!--
    Remove these fallbacks after the build servers are guaranteed to have VC142 
    -->
@ -71,4 +71,4 @@
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
--- a/src/Microsoft.DotNet.Wpf/src/PenImc/dll/PenImc.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/PenImc/dll/PenImc.vcxproj
@ -71,7 +71,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
-      <UseOfATL>true</UseOfATL>
+      <UseOfATL>false</UseOfATL>
      <PreprocessorDefinitions>_MERGE_PROXYSTUB;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSourceDir)PenImc\inc\;$(IntermediateOutputPath)</AdditionalIncludeDirectories>
    </ClCompile>
@ -95,4 +95,4 @@
  </PropertyGroup>
  <Import Project="$(GenerateModuleDefinitionFileTargets)" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/dll/wpfgfx.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/dll/wpfgfx.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM64">
      <Configuration>Debug</Configuration>
@ -159,4 +159,4 @@
  </PropertyGroup>
  <Import Project="$(GenerateModuleDefinitionFileTargets)" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>