Build authoring cleanup (#630)

* Don't launch debugger during build unless an environment variable is set * Add .editorconfig and apply to msbuild files * Delete obsolete sample pack script * Suppress some pack warnings * Build the metadata package to the same path as docs by default * Lots of build authoring cleanup * Consolidate nuget.config files wherever possible. * Consolidate msbuild sdk versions into a global.json file. * Consolidate definitions of OutputPath in msbuild projects. * Remove/fix msbuild properties that were inconsistently or redundantly applied in project files. * Move Project Sdk attributes from Sdk.props to each project that imported it. * Remove a bunch of 1-project solution files in favor of a new BuildTools.sln that contains them all. * Target net5.0 instead of netcoreapp3.1 * Add task to print out .NET version info * Disable signing consistently * Set up VS env vars * Fix bad paths for winmd
2021-09-02 21:36:15 -06:00 · 2021-09-02 21:36:15 -06:00 · 931fa65996
--- a/apidocs/.editorconfig
+++ b/apidocs/.editorconfig
@ -30,6 +30,7 @@ indent_size = 2
 # JSON files
 [*.json]
 indent_size = 2
+indent_style = space

 # Dotnet code style settings:
 [*.{cs,vb}]
@ -128,9 +129,9 @@ csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left

 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_for_built_in_types = false
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_elsewhere = false:warning

 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none
@ -160,10 +161,14 @@ csharp_new_line_before_members_in_anonymous_types = true
 # Blocks are allowed
 csharp_prefer_braces = true:silent

-[*.cs]
-
 # SA1130: Use lambda syntax
 dotnet_diagnostic.SA1130.severity = silent

+# CA1508: Avoid dead conditional code
+dotnet_diagnostic.CA1508.severity = warning
+
+# IDE1006: Naming Styles - StyleCop handles these for us
+dotnet_diagnostic.IDE1006.severity = none
+
 [*.sln]
 indent_style = tab
--- a/BuildTools/BuildTools.proj
+++ b/BuildTools/BuildTools.proj
@ -1,8 +1,4 @@
-<Project Sdk="Microsoft.Build.Traversal/3.0.23">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.Build.Traversal">
  <ItemGroup>
    <ProjectReference Include="..\sources\msbuild\MetadataTasks\MetadataTasks.csproj"/>
    <ProjectReference Include="..\sources\ConstantsScraper\ConstantsScraper.csproj"/>
@ -11,6 +7,7 @@
    <ProjectReference Include="..\sources\Win32MetadataInterop\Win32MetadataInterop.csproj"/>
  </ItemGroup>

+  <!-- These are here to support CommonUtils.ps1, which parses the .props file that nuget restore generates based on these. -->
  <ItemGroup>
    <PackageReference Include="Microsoft.Windows.SDK.CPP" Version="10.0.19041.5" GeneratePathProperty="true"/>
    <PackageReference Include="Microsoft.Windows.SDK.CPP.x64" Version="10.0.19041.5" GeneratePathProperty="true"/>
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -11,12 +11,27 @@
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <RepoRootPath>$(MSBuildThisFileDirectory)</RepoRootPath>
+    <BaseIntermediateOutputPath>$(RepoRootPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <OutputPath>$(RepoRootPath)bin\$(Configuration)</OutputPath>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
+
+    <TaskBinDir>$(RepoRootPath)bin\$(Configuration)\netstandard2.0\</TaskBinDir>
+
+    <LangVersion>9</LangVersion>
+
+    <Company>Microsoft</Company>
+    <Authors>Microsoft</Authors>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <PackageProjectUrl>https://github.com/microsoft/win32metadata</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageIcon>images/windows.png</PackageIcon>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-      <Version>3.4.194</Version>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <None Include="$(RepoRootPath)images/windows.png" Pack="true" PackagePath="images/" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231" PrivateAssets="all" />
  </ItemGroup>
 </Project>
--- a/apidocs/Directory.Build.props
+++ b/apidocs/Directory.Build.props
@ -2,9 +2,7 @@
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />

  <PropertyGroup>
-    <PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>9.0</LangVersion>
    <Nullable>enable</Nullable>
    <SignAssembly>true</SignAssembly>
    <AssemblyOriginatorKeyFile>$(RepoRootPath)\strongname.snk</AssemblyOriginatorKeyFile>
--- a/apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj
+++ b/apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj
@ -5,15 +5,9 @@
    <NoWarn>$(NoWarn);NU5128;NU5125</NoWarn>

    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <Company>Microsoft</Company>
-    <Authors>Microsoft</Authors>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
    <Description>Microsoft Windows API documentation</Description>
    <PackageTags>Win32 Metadata</PackageTags>
-    <PackageProjectUrl>https://github.com/microsoft/win32metadata</PackageProjectUrl>
    <PackageLicenseUrl>https://aka.ms/WinSDKLicenseURL</PackageLicenseUrl>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageIcon>images/windows.png</PackageIcon>
  </PropertyGroup>

  <ItemGroup>
@ -22,7 +16,6 @@
  <ItemGroup>
    <None Include="@(DocOutputPath)" Pack="true" PackagePath="" />
    <None Include="buildTransitive/**" Pack="true" PackagePath="buildTransitive" />
-    <None Include="../../images/windows.png" Pack="true" PackagePath="images/" />
  </ItemGroup>

  <ItemGroup>
--- a/apidocs/ScrapeDocs/Directory.Build.props
+++ b/apidocs/ScrapeDocs/Directory.Build.props
@ -1,6 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IsCodeGenerationProject>true</IsCodeGenerationProject>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />
-</Project>
--- a/apidocs/ScrapeDocs/ScrapeDocs.csproj
+++ b/apidocs/ScrapeDocs/ScrapeDocs.csproj
@ -2,6 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
+    <!-- Use plural TargetFrameworks here because we set the singular as a global property in a referencing project. -->
    <TargetFrameworks>net5.0</TargetFrameworks>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/apidocs/global.json
+++ b/apidocs/global.json
@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "5.0.301"
-  }
-}
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -21,10 +21,10 @@ jobs:
    lfs: true

  - task: UseDotNet@2
-    displayName: Use DotNet 3.x
+    displayName: ⚙ Install .NET SDK
    inputs:
-      packageType: 'sdk'
-      version: '3.x'
+      packageType: sdk
+      useGlobalJson: true

  - task: PowerShell@2
    displayName: Set build version
@ -70,10 +70,10 @@ jobs:
  - checkout: self
    lfs: true
  - task: UseDotNet@2
-    displayName: Use DotNet 3.x
+    displayName: ⚙ Install .NET SDK
    inputs:
-      packageType: 'sdk'
-      version: '3.x'
+      packageType: sdk
+      useGlobalJson: true

  - task: PowerShell@2
    displayName: GenerateMetadataSource.ps1 - x86
@ -97,10 +97,10 @@ jobs:
  - checkout: self
    lfs: true
  - task: UseDotNet@2
-    displayName: Use DotNet 3.x
+    displayName: ⚙ Install .NET SDK
    inputs:
-      packageType: 'sdk'
-      version: '3.x'
+      packageType: sdk
+      useGlobalJson: true

  - task: PowerShell@2
    displayName: GenerateMetadataSource.ps1 - arm64
@ -127,17 +127,17 @@ jobs:
  - checkout: self
    lfs: true

-  - task: UseDotNet@2
-    displayName: Use DotNet 3.x
+  - task: BatchScript@1
+    displayName: Set up VS environment
    inputs:
-      packageType: 'sdk'
-      version: '3.x'
+      filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat'
+      modifyEnvironment: true

  - task: UseDotNet@2
-    displayName: Use DotNet 5.x
+    displayName: ⚙ Install .NET SDK
    inputs:
-      packageType: 'sdk'
-      version: '5.x'
+      packageType: sdk
+      useGlobalJson: true

    # ESRP Authenticode sign package DLLs
  - task: UseDotNet@2
@ -146,6 +146,9 @@ jobs:
      packageType: runtime
      version: 2.1.x

+  - script: dotnet --info
+    displayName: Display .NET SDK/runtime info
+
  - task: DownloadPipelineArtifact@2
    displayName: Download x64 scraper obj assets
    inputs:
@ -230,11 +233,53 @@ jobs:
    condition: and(succeeded(), eq(variables['SignFiles'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))

  - task: EsrpCodeSigning@1
-    displayName: 'Authenticode Sign Binaries in MSBuild SDK package'
+    displayName: Authenticode sign net5.0 binaries in MSBuild SDK package
    inputs:
      ConnectedServiceName: 'Undocked RegFree Signing Connection'
-      FolderPath: '$(Build.SourcesDirectory)\bin\release\netcoreapp3.1'
-      Pattern: 'ClangSharpSourceToWinmd.dll,ConstantsScraper.dll,MetadataTasks.dll,MetadataUtils.dll,WinmdUtils.dll'
+      FolderPath: '$(Build.SourcesDirectory)\bin\$(BuildConfiguration)\net5.0'
+      Pattern: 'ClangSharpSourceToWinmd.dll,ConstantsScraper.dll,MetadataUtils.dll,WinmdUtils.dll'
+      signConfigType: 'inlineSignParams'
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-230012",
+            "operationSetCode": "SigntoolSign",
+            "parameters": [
+              {
+                "parameterName": "OpusName",
+                "parameterValue": "Microsoft"
+              },
+              {
+                "parameterName": "OpusInfo",
+                "parameterValue": "http://www.microsoft.com"
+              },
+              {
+                "parameterName": "PageHash",
+                "parameterValue": "/NPH"
+              },
+              {
+                "parameterName": "FileDigest",
+                "parameterValue": "/fd sha256"
+              },
+              {
+                "parameterName": "TimeStamp",
+                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+              }
+            ],
+            "toolName": "signtool.exe",
+            "toolVersion": "6.2.9304.0"
+          }
+        ]
+      SessionTimeout: '60'
+      MaxConcurrency: '50'
+      MaxRetryAttempts: '2'
+    condition: and(succeeded(), eq(variables['SignFiles'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
+  - task: EsrpCodeSigning@1
+    displayName: Authenticode sign netstandard2.0 binaries in MSBuild SDK package
+    inputs:
+      ConnectedServiceName: 'Undocked RegFree Signing Connection'
+      FolderPath: '$(Build.SourcesDirectory)\bin\$(BuildConfiguration)\netstandard2.0'
+      Pattern: 'MetadataTasks.dll'
      signConfigType: 'inlineSignParams'
      inlineOperation: |
        [
@ -361,7 +406,6 @@ jobs:
    inputs:
      packageType: sdk
      useGlobalJson: true
-      workingDirectory: apidocs

  # ESRP Authenticode sign package DLLs
  - task: UseDotNet@2
--- a/global.json
+++ b/global.json
@ -0,0 +1,12 @@
+{
+  "sdk": {
+    "version": "5.0.400",
+    "allowPrerelease": false,
+    "rollForward": "feature"
+  },
+  "msbuild-sdks": {
+    "Microsoft.Build.NoTargets": "3.0.4",
+    "Microsoft.Build.Traversal": "3.0.23",
+    "Microsoft.Windows.WinmdGenerator": "0.2.118-preview"
+  }
+}
--- a/sources/msbuild/DiaSdk/nuget.config
+++ b/sources/msbuild/DiaSdk/nuget.config
--- a/scripts/BuildMetadataBin.ps1
+++ b/scripts/BuildMetadataBin.ps1
@ -26,8 +26,7 @@ $assemblyVersion = nbgv get-version -v AssemblyVersion
 $constantsScraperPathBin = "$metadataToolsBin\ConstantsScraper.dll"
 $clangSharpSourceToWinmdBin = "$metadataToolsBin\ClangSharpSourceToWinmd.dll"

-$metadataInteropPath = "$sourcesDir\Win32MetadataInterop"
-$metadataInteropBin = "$metadataInteropPath\bin\Release\netstandard2.1\Windows.Win32.Interop.dll"
+$metadataInteropBin = "$PSScriptRoot\..\bin\Release\netstandard2.1\Windows.Win32.Interop.dll"

 Copy-Item $metadataInteropBin $binDir

--- a/scripts/CommonUtils.ps1
+++ b/scripts/CommonUtils.ps1
@ -12,7 +12,7 @@ $sdkApiPath = "$rootDir\ext\sdk-api"
 $sdkGeneratedSourceDir = "$emitterDir\generated"
 $artifactsDir = "$scraperDir\obj"
 $recompiledIdlHeadersDir = "$artifactsDir\RecompiledIdlHeaders"
-$metadataToolsBin = "$binDir\release\netcoreapp3.1"
+$metadataToolsBin = "$binDir\release\net5.0"

 if (Test-Path -Path $binDir -PathType leaf)
 {
@ -24,17 +24,17 @@ if (!(Test-Path -Path $binDir))
    New-Item -ItemType Directory -Force -Path $binDir | Out-Null
 }

-function Create-Directory([string[]] $Path) 
+function Create-Directory([string[]] $Path)
 {
-    if (!(Test-Path -Path $Path)) 
+    if (!(Test-Path -Path $Path))
    {
        New-Item -Path $Path -Force -ItemType "Directory" | Out-Null
    }
 }

-function Remove-Directory([string[]] $Path) 
+function Remove-Directory([string[]] $Path)
 {
-    if ((Test-Path -Path $Path)) 
+    if ((Test-Path -Path $Path))
    {
        Remove-Item $Path -Recurse
    }
@ -67,7 +67,7 @@ function Install-BuildTools
    Install-DotNetTool -Name ClangSharpPInvokeGenerator -Version 11.0.0-beta3
    Install-DotNetTool -Name nbgv

-    & dotnet build "$rootDir\BuildTools\BuildTools.proj" -c Release
+    & dotnet build "$rootDir\buildtools" -c Release
 }

 function Replace-Text
@ -79,20 +79,20 @@ function Replace-Text
    {
        $content = $content.Replace($key, $items[$key]);
    }
-    
+
    Set-Content -path $path -Encoding UTF8 -value $content
 }

 function Get-LibMappingsFile
 {
    $libMappingOutputFileName = Join-Path -Path $scraperDir -ChildPath "libMappings.rsp"
-    
+
    return $libMappingOutputFileName
 }

 function Get-BuildToolsNugetProps
 {
-    [xml]$buildNugetProps = Get-Content -path "$rootDir\BuildTools\obj\BuildTools.proj.nuget.g.props"
+    [xml]$buildNugetProps = Get-Content -path "$rootDir\obj\BuildTools\BuildTools.proj.nuget.g.props"
    return $buildNugetProps;
 }

@ -144,7 +144,7 @@ function Invoke-RecompileMidlHeaders
        copy-item -Path "$sdkIncludeDir\winrt" -destination "$recompiledIdlHeadersDir" -recurse

        Write-Output "Recompiling midl headers with SAL annotations in $recompiledIdlHeadersDir"
-        
+
        $version = $defaultWinSDKNugetVersion
        $sdkParts = $version.Split('.')
        $sdkVersion = "$($sdkParts[0]).$($sdkParts[1]).$($sdkParts[2]).0"
@ -163,13 +163,13 @@ function Get-VcDirPath

    $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
    $installDir = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-    if ($installDir) 
+    if ($installDir)
    {
        $path = join-path $installDir 'VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt'
-        if (test-path $path) 
+        if (test-path $path)
        {
            $version = Get-Content -raw $path
-            if ($version) 
+            if ($version)
            {
                $version = $version.Trim()
                $path = join-path $installDir "VC\Tools\MSVC\$version\bin\Host$HostArch\$Arch"
@ -196,7 +196,7 @@ function Get-OutputWinmdFileName

    return $path
 }
-    
+
 function Download-Nupkg
 {
    Param ([string] $name, [string] $version, [string] $outputDir)
@ -212,7 +212,7 @@ function Get-ExcludedItems
 {
    param ([string[]]$rspFiles)
    [hashtable]$excludedItems = @{}
-    
+
    $inExcluded = $false
    foreach ($rsp in $rspFiles)
    {
--- a/scripts/SamplePack.ps1
+++ b/scripts/SamplePack.ps1
@ -1,2 +0,0 @@
-.\tools\nuget.exe pack .\sources\nuget\Microsoft.Windows.SDK.Win32Metadata\Microsoft.Windows.SDK.Win32Metadata.nuspec -version 10.0.20195.1001-preview.rs-onecore-dep -BasePath . -verbosity Detailed -OutputDirectory $env:TEMP
-
--- a/sources/BuildTools.sln
+++ b/sources/BuildTools.sln
@ -0,0 +1,54 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31629.42
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{D3E6399F-0983-4742-B07C-874B6ED80E51}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetadataTasks", "msbuild\MetadataTasks\MetadataTasks.csproj", "{5B6F6176-0031-4105-B9FF-B713499D8975}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConstantsScraper", "ConstantsScraper\ConstantsScraper.csproj", "{8C0897A4-2BA6-40D5-AF41-130BE109C024}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClangSharpSourceToWinmd", "ClangSharpSourceToWinmd\ClangSharpSourceToWinmd.csproj", "{74D143DF-9C79-4E34-83C8-0347826317D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinmdUtils", "WinmdUtils\WinmdUtils.csproj", "{D58855C2-F427-4C4D-990A-7F932A7B4CA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win32MetadataInterop", "Win32MetadataInterop\Win32MetadataInterop.csproj", "{C8AA8253-FF34-4963-9CD0-B7A4C28D33BB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5B6F6176-0031-4105-B9FF-B713499D8975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B6F6176-0031-4105-B9FF-B713499D8975}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B6F6176-0031-4105-B9FF-B713499D8975}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B6F6176-0031-4105-B9FF-B713499D8975}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C0897A4-2BA6-40D5-AF41-130BE109C024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C0897A4-2BA6-40D5-AF41-130BE109C024}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C0897A4-2BA6-40D5-AF41-130BE109C024}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C0897A4-2BA6-40D5-AF41-130BE109C024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74D143DF-9C79-4E34-83C8-0347826317D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74D143DF-9C79-4E34-83C8-0347826317D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74D143DF-9C79-4E34-83C8-0347826317D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74D143DF-9C79-4E34-83C8-0347826317D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D58855C2-F427-4C4D-990A-7F932A7B4CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D58855C2-F427-4C4D-990A-7F932A7B4CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D58855C2-F427-4C4D-990A-7F932A7B4CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D58855C2-F427-4C4D-990A-7F932A7B4CA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8AA8253-FF34-4963-9CD0-B7A4C28D33BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8AA8253-FF34-4963-9CD0-B7A4C28D33BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8AA8253-FF34-4963-9CD0-B7A4C28D33BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8AA8253-FF34-4963-9CD0-B7A4C28D33BB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5B6F6176-0031-4105-B9FF-B713499D8975} = {D3E6399F-0983-4742-B07C-874B6ED80E51}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {156D7600-E986-417B-9D16-E6FA1039AF42}
+	EndGlobalSection
+EndGlobal
--- a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
+++ b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
@ -2,19 +2,10 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <TargetFramework>net5.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>..\..\bin\release</OutputPath>
-  </PropertyGroup>
-
  <ItemGroup>
    <Compile Remove="TestForParsing1.cs" />
    <Compile Remove="TestForParsing2.cs" />
--- a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.sln
+++ b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.sln
@ -1,49 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30413.136
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClangSharpSourceToWinmd", "ClangSharpSourceToWinmd.csproj", "{1A969AD2-5215-469C-BCBB-C7B38F4DA253}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win32MetadataInterop", "..\Win32MetadataInterop\Win32MetadataInterop.csproj", "{C08DB25A-5497-4CE2-82F2-2D8624283387}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinmdUtils", "..\WinmdUtils\WinmdUtils.csproj", "{6D8F0882-429D-4359-A3DD-CBD905D95C14}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConstantsScraper", "..\ConstantsScraper\ConstantsScraper.csproj", "{0EFEA32F-64C4-4FA3-A507-0ECD38CF0678}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetadataUtils", "..\MetadataUtils\MetadataUtils.csproj", "{BCE1D6B7-74EB-461A-A971-E55BFEA44DDF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1A969AD2-5215-469C-BCBB-C7B38F4DA253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A969AD2-5215-469C-BCBB-C7B38F4DA253}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A969AD2-5215-469C-BCBB-C7B38F4DA253}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A969AD2-5215-469C-BCBB-C7B38F4DA253}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C08DB25A-5497-4CE2-82F2-2D8624283387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08DB25A-5497-4CE2-82F2-2D8624283387}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08DB25A-5497-4CE2-82F2-2D8624283387}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C08DB25A-5497-4CE2-82F2-2D8624283387}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D8F0882-429D-4359-A3DD-CBD905D95C14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D8F0882-429D-4359-A3DD-CBD905D95C14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D8F0882-429D-4359-A3DD-CBD905D95C14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D8F0882-429D-4359-A3DD-CBD905D95C14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EFEA32F-64C4-4FA3-A507-0ECD38CF0678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EFEA32F-64C4-4FA3-A507-0ECD38CF0678}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EFEA32F-64C4-4FA3-A507-0ECD38CF0678}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EFEA32F-64C4-4FA3-A507-0ECD38CF0678}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCE1D6B7-74EB-461A-A971-E55BFEA44DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCE1D6B7-74EB-461A-A971-E55BFEA44DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCE1D6B7-74EB-461A-A971-E55BFEA44DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCE1D6B7-74EB-461A-A971-E55BFEA44DDF}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {55478AB3-8FFE-47CD-B394-F089CFD6F5FC}
-	EndGlobalSection
-EndGlobal
--- a/sources/ConstantsScraper/ConstantsScraper.csproj
+++ b/sources/ConstantsScraper/ConstantsScraper.csproj
@ -2,15 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath></OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\bin\release</OutputPath>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/sources/ConstantsScraper/ConstantsScraper.sln
+++ b/sources/ConstantsScraper/ConstantsScraper.sln
@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConstantsScraper", "ConstantsScraper.csproj", "{39E2AD50-323F-4490-8B05-A6C6AFCC1443}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PartitionUtils", "..\PartitionUtils\PartitionUtils.csproj", "{7D60EA7C-6A97-421E-A84E-8F61F73DB245}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetadataUtils", "..\MetadataUtils\MetadataUtils.csproj", "{B101B407-94A4-4BC6-A1E8-A0E1AC04B246}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39E2AD50-323F-4490-8B05-A6C6AFCC1443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39E2AD50-323F-4490-8B05-A6C6AFCC1443}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39E2AD50-323F-4490-8B05-A6C6AFCC1443}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39E2AD50-323F-4490-8B05-A6C6AFCC1443}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D60EA7C-6A97-421E-A84E-8F61F73DB245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D60EA7C-6A97-421E-A84E-8F61F73DB245}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D60EA7C-6A97-421E-A84E-8F61F73DB245}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D60EA7C-6A97-421E-A84E-8F61F73DB245}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B101B407-94A4-4BC6-A1E8-A0E1AC04B246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B101B407-94A4-4BC6-A1E8-A0E1AC04B246}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B101B407-94A4-4BC6-A1E8-A0E1AC04B246}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B101B407-94A4-4BC6-A1E8-A0E1AC04B246}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {570EE57B-A467-4DAE-A45C-60EBE8A0872B}
-	EndGlobalSection
-EndGlobal
--- a/sources/MetadataUtils/MetadataUtils.csproj
+++ b/sources/MetadataUtils/MetadataUtils.csproj
@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <OutputPath>..\..\bin\release</OutputPath>
  </PropertyGroup>

  <ItemGroup>
--- a/sources/PartitionUtils/PartitionUtils.csproj
+++ b/sources/PartitionUtils/PartitionUtils.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/sources/WinmdUtils/WinmdUtils.csproj
+++ b/sources/WinmdUtils/WinmdUtils.csproj
@ -2,11 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\bin\release</OutputPath>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/sources/WinmdUtils/WinmdUtils.sln
+++ b/sources/WinmdUtils/WinmdUtils.sln
@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinmdUtils", "WinmdUtils.csproj", "{E9A699AC-A690-42ED-83E1-66CB7F65058D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E9A699AC-A690-42ED-83E1-66CB7F65058D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9A699AC-A690-42ED-83E1-66CB7F65058D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9A699AC-A690-42ED-83E1-66CB7F65058D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9A699AC-A690-42ED-83E1-66CB7F65058D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {10CB32D9-2A44-4DE0-B020-26B136672FE1}
-	EndGlobalSection
-EndGlobal
--- a/sources/msbuild/DiaSdk/DiaSdk.proj
+++ b/sources/msbuild/DiaSdk/DiaSdk.proj
@ -1,58 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
-    
-    <!-- These are for debugging purposes only. A normal project wouldn't set these -->
+<Project Sdk="Microsoft.Build.NoTargets">
+  <!-- These are for debugging purposes only. A normal project wouldn't set these -->
+  <PropertyGroup>
+    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net5.0</ToolsBinDir>
+    <LibToolsBinDir>$(RepoRootPath)tools</LibToolsBinDir>
+    <ScriptsDir>$(RepoRootPath)scripts</ScriptsDir>
+    <Win32MetadataScraperAssetsDir>$(RepoRootPath)generation\scraper</Win32MetadataScraperAssetsDir>
+    <Win32MetadataScraperGeneratedAssetsDir>$(RepoRootPath)generation\scraper\obj\x64</Win32MetadataScraperGeneratedAssetsDir>
+    <Win32WinmdBinDir>$(RepoRootPath)bin</Win32WinmdBinDir>
+  </PropertyGroup>
+
+  <Import Project="..\sdk\sdk.props" />
+
+  <PropertyGroup>
+    <OutputWinmd>$(RepoRootPath)bin\Microsoft.Dia.winmd</OutputWinmd>
+    <WinmdVersion>1.0.0.0</WinmdVersion>
+    <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
+    <DiaSdkRoot>$(VSINSTALLDIR)\DIA SDK</DiaSdkRoot>
+    <DiaIdlRoot>$(DiaSdkRoot)\idl</DiaIdlRoot>
+    <DiaIncRoot>$(DiaSdkRoot)\include</DiaIncRoot>
+    <AdditionalIncludes>$(CompiledHeadersDir);$(DiaIncRoot)</AdditionalIncludes>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>Microsoft.Dia.Win32Metadata.nuspec</NuspecFile>
+    <NuspecProperties></NuspecProperties>
+    <NuspecBasePath>.</NuspecBasePath>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);NU5100;NU5127</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Idls Include="$(DiaIdlRoot)\dia2.idl"/>
+    <Headers Include="$(CompiledHeadersDir)\dia2.h;$(DiaIncRoot)\cvconst.h"/>
+
+    <!-- This project doesn't have any libs-->
+    <!--ImportLibs Include="@(Libs)"/-->
+
+    <Partition Include="main.cpp">
+      <TraverseFiles>@(Headers)</TraverseFiles>
+      <Namespace>Microsoft.Dia</Namespace>
+      <Exclude>__MIDL___MIDL_itf_dia2_0000_0033_0001;__MIDL___MIDL_itf_dia2_0000_0000_0001;PfnPDBDebugDirV</Exclude>
+      <Remap>__MIDL___MIDL_itf_dia2_0000_0042_0001=FPODATA</Remap>
+      <ManualFiles>dia.manual.cs</ManualFiles>
+    </Partition>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MetadataTasks\MetadataTasks.csproj" />
+    <ProjectReference Include="..\..\ClangSharpSourceToWinmd\ClangSharpSourceToWinmd.csproj" />
+  </ItemGroup>
+
+  <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
    <PropertyGroup>
-        <TaskBinDir>$(MSBuildThisFileDirectory)..\..\..\bin\release\netcoreapp3.1</TaskBinDir>
-        <ToolsBinDir>$(MSBuildThisFileDirectory)..\..\..\bin\release\netcoreapp3.1</ToolsBinDir>
-        <LibToolsBinDir>$(MSBuildThisFileDirectory)..\..\..\tools</LibToolsBinDir>
-        <ScriptsDir>$(MSBuildThisFileDirectory)..\..\..\scripts</ScriptsDir>
-        <Win32MetadataScraperAssetsDir>$(MSBuildThisFileDirectory)..\..\..\generation\scraper</Win32MetadataScraperAssetsDir>
-        <Win32MetadataScraperGeneratedAssetsDir>$(MSBuildThisFileDirectory)..\..\..\generation\scraper\obj\x64</Win32MetadataScraperGeneratedAssetsDir>
-		<Win32WinmdBinDir>$(MSBuildThisFileDirectory)..\..\..\bin</Win32WinmdBinDir>
+      <NuspecProperties>$(NuspecProperties);OutputWinmd=$(OutputWinmd);Version=$(Version)</NuspecProperties>
    </PropertyGroup>
+  </Target>

-    <Import Project="..\sdk\sdk.props" />
-
-    <PropertyGroup>
-        <OutputWinmd>bin\Microsoft.Dia.winmd</OutputWinmd>
-        <WinmdVersion>1.0.0.0</WinmdVersion>
-        <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
-		<DiaSdkRoot>C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\DIA SDK</DiaSdkRoot>
-		<DiaIdlRoot>$(DiaSdkRoot)\idl</DiaIdlRoot>
-		<DiaIncRoot>$(DiaSdkRoot)\include</DiaIncRoot>
-		<AdditionalIncludes>$(CompiledHeadersDir);$(DiaIncRoot)</AdditionalIncludes>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <NuspecFile>Microsoft.Dia.Win32Metadata.nuspec</NuspecFile>
-        <NuspecProperties></NuspecProperties>
-        <NuspecBasePath>.</NuspecBasePath>
-        <TargetFramework>netstandard2.0</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Idls Include="$(DiaIdlRoot)\dia2.idl"/>
-		<Headers Include="$(CompiledHeadersDir)\dia2.h;$(DiaIncRoot)\cvconst.h"/>
-
-        <!-- This project doesn't have any libs-->
-        <!--ImportLibs Include="@(Libs)"/-->
-
-        <Partition Include="main.cpp">
-            <TraverseFiles>@(Headers)</TraverseFiles>
-            <Namespace>Microsoft.Dia</Namespace>
-			<Exclude>__MIDL___MIDL_itf_dia2_0000_0033_0001;__MIDL___MIDL_itf_dia2_0000_0000_0001;PfnPDBDebugDirV</Exclude>
-            <Remap>__MIDL___MIDL_itf_dia2_0000_0042_0001=FPODATA</Remap>
-			<ManualFiles>dia.manual.cs</ManualFiles>
-        </Partition>
-    </ItemGroup>
-
-    <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
-	  <PropertyGroup>
-	    <NuspecProperties>$(NuspecProperties);Version=$(Version)</NuspecProperties>
-      </PropertyGroup>
-    </Target>
-
-    <Import Project="..\sdk\sdk.targets" />
-</Project>
+  <Import Project="..\sdk\sdk.targets" />
+</Project>
--- a/sources/msbuild/DiaSdk/Microsoft.Dia.Win32Metadata.nuspec
+++ b/sources/msbuild/DiaSdk/Microsoft.Dia.Win32Metadata.nuspec
@ -21,7 +21,7 @@
  <files>
      <file src="..\..\..\images\windows.png" target="images"/>

-      <file src="bin\Microsoft.Dia.winmd" target=""/>
+      <file src="$OutputWinmd$" target=""/>
      <file src="buildTransitive\**" target="buildTransitive\"/>
      <file src="buildTransitive\**" target="build\"/>
  </files>
--- a/sources/msbuild/GeneratorSample/GeneratorSample.proj
+++ b/sources/msbuild/GeneratorSample/GeneratorSample.proj
@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Windows.WinmdGenerator/0.2.118-preview">
-    
-    <PropertyGroup>
-        <OutputWinmd>bin\Windows.Win32.Graphics.DirectWriteCore.winmd</OutputWinmd>
-        <WinmdVersion>1.0.0.0</WinmdVersion>
-        <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
-    </PropertyGroup>
+<Project Sdk="Microsoft.Windows.WinmdGenerator">

-    <ItemGroup>
-        <DWriteHeaders Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.h"/>
-        <DWriteLibs Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.lib"/>
+  <PropertyGroup>
+    <OutputWinmd>bin\Windows.Win32.Graphics.DirectWriteCore.winmd</OutputWinmd>
+    <WinmdVersion>1.0.0.0</WinmdVersion>
+    <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
+  </PropertyGroup>

-        <ImportLibs Include="@(DWriteLibs)"/>
-        <Partition Include="main.cpp">
-            <TraverseFiles>@(DWriteHeaders)</TraverseFiles>
-            <Namespace>Windows.Win32.Graphics.DirectWriteCore</Namespace>
-            <Exclude>ID2D1SimplifiedGeometrySink;_D3DCOLORVALUE</Exclude>
-        </Partition>
-    </ItemGroup>
+  <ItemGroup>
+    <DWriteHeaders Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.h"/>
+    <DWriteLibs Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.lib"/>

-    <ItemGroup>
-        <PackageReference Include="Microsoft.ProjectReunion.DWrite" Version="0.5.6" GeneratePathProperty="true"/>
-    </ItemGroup>
+    <ImportLibs Include="@(DWriteLibs)"/>
+    <Partition Include="main.cpp">
+      <TraverseFiles>@(DWriteHeaders)</TraverseFiles>
+      <Namespace>Windows.Win32.Graphics.DirectWriteCore</Namespace>
+      <Exclude>ID2D1SimplifiedGeometrySink;_D3DCOLORVALUE</Exclude>
+    </Partition>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ProjectReunion.DWrite" Version="0.5.6" GeneratePathProperty="true"/>
+  </ItemGroup>

 </Project>
--- a/sources/msbuild/GeneratorSample/nuget.config
+++ b/sources/msbuild/GeneratorSample/nuget.config
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="LocalPackages" value="..\..\..\packages" />
-  </packageSources>
-  <disabledPackageSources>
-    <clear />
-  </disabledPackageSources>
-</configuration>
--- a/sources/msbuild/GeneratorSampleDebug/GeneratorSampleDebug.proj
+++ b/sources/msbuild/GeneratorSampleDebug/GeneratorSampleDebug.proj
@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
-    
-    <!-- These are for debugging purposes only. A normal project wouldn't set these -->
-    <PropertyGroup>
-        <TaskBinDir>$(MSBuildThisFileDirectory)..\..\..\bin\release\netcoreapp3.1</TaskBinDir>
-        <ToolsBinDir>$(MSBuildThisFileDirectory)..\..\..\bin\release\netcoreapp3.1</ToolsBinDir>
-        <LibToolsBinDir>$(MSBuildThisFileDirectory)..\..\..\tools</LibToolsBinDir>
-        <ScriptsDir>$(MSBuildThisFileDirectory)..\..\..\scripts</ScriptsDir>
-        <Win32MetadataScraperAssetsDir>$(MSBuildThisFileDirectory)..\..\..\generation\scraper</Win32MetadataScraperAssetsDir>
-        <Win32MetadataScraperGeneratedAssetsDir>$(MSBuildThisFileDirectory)..\..\..\generation\scraper\obj\x64</Win32MetadataScraperGeneratedAssetsDir>
-		<Win32WinmdBinDir>$(MSBuildThisFileDirectory)..\..\..\bin</Win32WinmdBinDir>
-    </PropertyGroup>
+<Project Sdk="Microsoft.Build.NoTargets">

-    <Import Project="..\sdk\sdk.props" />
+  <!-- These are for debugging purposes only. A normal project wouldn't set these -->
+  <PropertyGroup>
+    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net5.0</ToolsBinDir>
+    <LibToolsBinDir>$(RepoRootPath)tools</LibToolsBinDir>
+    <ScriptsDir>$(RepoRootPath)scripts</ScriptsDir>
+    <Win32MetadataScraperAssetsDir>$(RepoRootPath)generation\scraper</Win32MetadataScraperAssetsDir>
+    <Win32MetadataScraperGeneratedAssetsDir>$(RepoRootPath)generation\scraper\obj\x64</Win32MetadataScraperGeneratedAssetsDir>
+    <Win32WinmdBinDir>$(RepoRootPath)bin</Win32WinmdBinDir>
+  </PropertyGroup>

-    <PropertyGroup>
-        <OutputWinmd>bin\Windows.Win32.Graphics.DirectWriteCore.winmd</OutputWinmd>
-        <WinmdVersion>1.0.0.0</WinmdVersion>
-        <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
-    </PropertyGroup>
+  <Import Project="..\sdk\sdk.props" />

-    <ItemGroup>
-        <DWriteHeaders Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.h"/>
-        <DWriteLibs Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.lib"/>
+  <PropertyGroup>
+    <OutputWinmd>bin\Windows.Win32.Graphics.DirectWriteCore.winmd</OutputWinmd>
+    <WinmdVersion>1.0.0.0</WinmdVersion>
+    <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
+  </PropertyGroup>

-        <ImportLibs Include="@(DWriteLibs)"/>
-        <Partition Include="main.cpp">
-            <TraverseFiles>@(DWriteHeaders)</TraverseFiles>
-            <Namespace>Windows.Win32.Graphics.DirectWriteCore</Namespace>
-            <Exclude>ID2D1SimplifiedGeometrySink;_D3DCOLORVALUE</Exclude>
-        </Partition>
-    </ItemGroup>
+  <ItemGroup>
+    <DWriteHeaders Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.h"/>
+    <DWriteLibs Include="$(PkgMicrosoft_ProjectReunion_DWrite)\**\*.lib"/>

-    <ItemGroup>
-        <PackageReference Include="Microsoft.ProjectReunion.DWrite" Version="0.5.6" GeneratePathProperty="true"/>
-    </ItemGroup>
+    <ImportLibs Include="@(DWriteLibs)"/>
+    <Partition Include="main.cpp">
+      <TraverseFiles>@(DWriteHeaders)</TraverseFiles>
+      <Namespace>Windows.Win32.Graphics.DirectWriteCore</Namespace>
+      <Exclude>ID2D1SimplifiedGeometrySink;_D3DCOLORVALUE</Exclude>
+    </Partition>
+  </ItemGroup>

-    <Import Project="..\sdk\sdk.targets" />
-</Project>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ProjectReunion.DWrite" Version="0.5.6" GeneratePathProperty="true"/>
+  </ItemGroup>
+
+  <Import Project="..\sdk\sdk.targets" />
+</Project>
--- a/sources/msbuild/GeneratorSampleDebug/nuget.config
+++ b/sources/msbuild/GeneratorSampleDebug/nuget.config
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-  <disabledPackageSources>
-    <clear />
-  </disabledPackageSources>
-</configuration>
--- a/sources/msbuild/MetadataTasks/CompileIdls.cs
+++ b/sources/msbuild/MetadataTasks/CompileIdls.cs
@ -59,7 +59,10 @@ namespace MetadataTasks
        public override bool Execute()
        {
 #if DEBUG
-            System.Diagnostics.Debugger.Launch();
+            if (System.Environment.GetEnvironmentVariable("DEBUG_TASKS") == "1")
+            {
+                System.Diagnostics.Debugger.Launch();
+            }
 #endif

            string[] idls = GetIdls();
--- a/sources/msbuild/MetadataTasks/MetadataTasks.csproj
+++ b/sources/msbuild/MetadataTasks/MetadataTasks.csproj
@ -1,24 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <TargetFramework>netstandard2.0</TargetFramework>
    <WarningLevel>5</WarningLevel>
-    <OutputPath>..\..\..\bin\debug</OutputPath>
    <NoWarn>1701;1702;</NoWarn>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\..\bin\release</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="Program.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
  </ItemGroup>
--- a/sources/msbuild/MetadataTasks/MetadataTasks.sln
+++ b/sources/msbuild/MetadataTasks/MetadataTasks.sln
@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetadataTasks", "MetadataTasks.csproj", "{225700CA-AB1B-4C80-8C06-9F6C86749E44}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{225700CA-AB1B-4C80-8C06-9F6C86749E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{225700CA-AB1B-4C80-8C06-9F6C86749E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{225700CA-AB1B-4C80-8C06-9F6C86749E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{225700CA-AB1B-4C80-8C06-9F6C86749E44}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {41360FA1-98C7-4974-B24E-B62EBAA5D8E1}
-	EndGlobalSection
-EndGlobal
--- a/sources/msbuild/MetadataTasks/ScanLibs.cs
+++ b/sources/msbuild/MetadataTasks/ScanLibs.cs
@ -36,7 +36,10 @@ namespace MetadataTasks
        public override bool Execute()
        {
 #if DEBUG
-            System.Diagnostics.Debugger.Launch();
+            if (System.Environment.GetEnvironmentVariable("DEBUG_TASKS") == "1")
+            {
+                System.Diagnostics.Debugger.Launch();
+            }
 #endif

            Log.LogMessage($"Scanning libs...");
@ -56,7 +59,7 @@ namespace MetadataTasks
                    var functionName = match.Groups[2].Value;

                    if (!functionNames.Contains(functionName))
-                    {
+                    {
                        if (libLines.Length == 0)
                        {
                            libLines.AppendLine("--with-librarypath");
@ -85,8 +88,8 @@ namespace MetadataTasks
        private string[] GetLibs()
        {
            List<string> ret = new List<string>();
-            if (this.Libs != null)
-            {
+            if (this.Libs != null)
+            {
                foreach (var libItem in this.Libs)
                {
                    var libPath = libItem.ItemSpec;
@ -96,7 +99,7 @@ namespace MetadataTasks
                    }

                    ret.Add(libPath);
-                }
+                }
            }

            return ret.ToArray();
--- a/sources/msbuild/MetadataTasks/ScrapeHeaders.cs
+++ b/sources/msbuild/MetadataTasks/ScrapeHeaders.cs
@ -103,7 +103,7 @@ namespace MetadataTasks
            this.partitionsDir = Path.Combine(this.scraperDir, "Partitions");

            this.emitterDir = Path.Combine(this.generationDir, "emitter");
-            
+
            // Output parameter for the emitter
            this.GeneratedSourceDir = this.emitterDir;

@ -153,25 +153,25 @@ namespace MetadataTasks
        }

        private void CopyManualItems(ITaskItem partitionItem, string partitionName)
-        {
+        {
            string[] manualFiles = GetManualFiles(partitionItem);
-
-            if (manualFiles != null && manualFiles.Length > 0)
-            {
+
+            if (manualFiles != null && manualFiles.Length > 0)
+            {
                Log.LogMessage($"Copying manual files for partition {partitionItem}...");
-
-                string manualDestDir = Path.Combine(this.generatedDir, "manual", partitionName);
-                if (!Directory.Exists(manualDestDir))
-                {
-                    Directory.CreateDirectory(manualDestDir);
-                }
-
-                foreach (var manualFile in manualFiles)
-                {
-                    string destFile = Path.Combine(manualDestDir, Path.GetFileName(manualFile));
-                    File.Copy(manualFile, destFile, true);
-                }
-            }
+
+                string manualDestDir = Path.Combine(this.generatedDir, "manual", partitionName);
+                if (!Directory.Exists(manualDestDir))
+                {
+                    Directory.CreateDirectory(manualDestDir);
+                }
+
+                foreach (var manualFile in manualFiles)
+                {
+                    string destFile = Path.Combine(manualDestDir, Path.GetFileName(manualFile));
+                    File.Copy(manualFile, destFile, true);
+                }
+            }
        }

        private bool ProcessPartitionItem(ITaskItem partitionItem)
@ -214,21 +214,21 @@ namespace MetadataTasks

            HashSet<string> includeDirHash = new HashSet<string>();
            List<string> includeDirs = new List<string>();
-            
+
            // For sal.h, etc.
            includeDirs.Add(this.Win32MetadataScraperAssetsDir);

            if (this.AdditionalIncludes != null)
-            {
-                string[] dirs = this.AdditionalIncludes.Split(';');
-                foreach (var dir in dirs)
-                {
-                    if (!includeDirHash.Contains(dir))
-                    {
-                        includeDirHash.Add(dir);
-                        includeDirs.Add(dir);
+            {
+                string[] dirs = this.AdditionalIncludes.Split(';');
+                foreach (var dir in dirs)
+                {
+                    if (!includeDirHash.Contains(dir))
+                    {
+                        includeDirHash.Add(dir);
+                        includeDirs.Add(dir);
                    }
-                }
+                }
            }

            foreach (var traverseFile in traverseFiles)
@ -259,7 +259,7 @@ $@"--file
 --headerFile
 {headerTextFile}
 --include-directory");
-                
+
                foreach (var include in includeDirs)
                {
                    rspWriter.WriteLine(include);
@ -307,17 +307,17 @@ $@"--file
            AddWin32GeneratedRsp(args, "autoTypes.generated.rsp");
            AddWin32GeneratedRsp(args, "functionPointerFixups.generated.rsp");

-            if (this.Rsps != null)
-            {
-                foreach (var rspItem in this.Rsps)
-                {
-                    var rspPath = rspItem.ItemSpec;
-                    if (!Path.IsPathRooted(rspPath))
-                    {
-                        rspPath = Path.Combine(this.MSBuildProjectDirectory, rspPath);
-                    }
-
-                    args.Append($" \"@{rspPath}\"");
+            if (this.Rsps != null)
+            {
+                foreach (var rspItem in this.Rsps)
+                {
+                    var rspPath = rspItem.ItemSpec;
+                    if (!Path.IsPathRooted(rspPath))
+                    {
+                        rspPath = Path.Combine(this.MSBuildProjectDirectory, rspPath);
+                    }
+
+                    args.Append($" \"@{rspPath}\"");
                }
            }

@ -353,7 +353,7 @@ $@"--file

        private string[] GetFilesFromMetadata(ITaskItem item, string name)
        {
-            string[] items = item.GetMetadata(name).Split(';', System.StringSplitOptions.RemoveEmptyEntries);
+            string[] items = item.GetMetadata(name).Split(new[] { ';' }, System.StringSplitOptions.RemoveEmptyEntries);
            for (int i = 0; i < items.Length; i++)
            {
                if (!Path.IsPathRooted(items[i]))
--- a/sources/msbuild/WebView2SampleDebug/WebView2SampleDebug.proj
+++ b/sources/msbuild/WebView2SampleDebug/WebView2SampleDebug.proj
@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
+<Project Sdk="Microsoft.Build.NoTargets">

-    <!-- These are for debugging purposes only. A normal project wouldn't set these -->
-    <PropertyGroup>
-        <TaskBinDir>$(MSBuildThisFileDirectory)..\..\..\bin\release\netcoreapp3.1</TaskBinDir>
-        <ToolsBinDir>$(MSBuildThisFileDirectory)..\..\..\bin\release\netcoreapp3.1</ToolsBinDir>
-        <LibToolsBinDir>$(MSBuildThisFileDirectory)..\..\..\tools</LibToolsBinDir>
-        <ScriptsDir>$(MSBuildThisFileDirectory)..\..\..\scripts</ScriptsDir>
-        <Win32MetadataScraperAssetsDir>$(MSBuildThisFileDirectory)..\..\..\generation\scraper</Win32MetadataScraperAssetsDir>
-        <Win32MetadataScraperGeneratedAssetsDir>$(MSBuildThisFileDirectory)..\..\..\generation\scraper\obj\x64</Win32MetadataScraperGeneratedAssetsDir>
-		<Win32WinmdBinDir>$(MSBuildThisFileDirectory)..\..\..\bin</Win32WinmdBinDir>
-    </PropertyGroup>
+  <!-- These are for debugging purposes only. A normal project wouldn't set these -->
+  <PropertyGroup>
+    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net5.0</ToolsBinDir>
+    <LibToolsBinDir>$(RepoRootPath)tools</LibToolsBinDir>
+    <ScriptsDir>$(RepoRootPath)scripts</ScriptsDir>
+    <Win32MetadataScraperAssetsDir>$(RepoRootPath)generation\scraper</Win32MetadataScraperAssetsDir>
+    <Win32MetadataScraperGeneratedAssetsDir>$(RepoRootPath)generation\scraper\obj\x64</Win32MetadataScraperGeneratedAssetsDir>
+    <Win32WinmdBinDir>$(RepoRootPath)bin</Win32WinmdBinDir>
+  </PropertyGroup>

-    <Import Project="..\sdk\sdk.props" />
+  <Import Project="..\sdk\sdk.props" />

-    <PropertyGroup>
-        <OutputWinmd>bin\Microsoft.Web.WebView2.winmd</OutputWinmd>
-        <WinmdVersion>1.0.864.35</WinmdVersion>
-        <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputWinmd>bin\Microsoft.Web.WebView2.winmd</OutputWinmd>
+    <WinmdVersion>1.0.864.35</WinmdVersion>
+    <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
+  </PropertyGroup>

-    <ItemGroup>
-        <WebView2Headers Include="$(PkgMicrosoft_Web_WebView2)\**\*.h"/>
-        <WebView2Libs Include="$(PkgMicrosoft_Web_WebView2)\**\*.dll.lib"/>
+  <ItemGroup>
+    <WebView2Headers Include="$(PkgMicrosoft_Web_WebView2)\**\*.h"/>
+    <WebView2Libs Include="$(PkgMicrosoft_Web_WebView2)\**\*.dll.lib"/>

-        <ImportLibs Include="@(WebView2Libs)">
-            <StaticLibs>WebView2Loader=WebView2LoaderStatic</StaticLibs>
-        </ImportLibs>
+    <ImportLibs Include="@(WebView2Libs)">
+      <StaticLibs>WebView2Loader=WebView2LoaderStatic</StaticLibs>
+    </ImportLibs>

-        <Partition Include="main.cpp">
-            <TraverseFiles>@(WebView2Headers)</TraverseFiles>
-            <Namespace>Microsoft.Web.WebView2.Win32</Namespace>
-            <Exclude>CoreWebView2EnvironmentOptions</Exclude>
-        </Partition>
-    </ItemGroup>
+    <Partition Include="main.cpp">
+      <TraverseFiles>@(WebView2Headers)</TraverseFiles>
+      <Namespace>Microsoft.Web.WebView2.Win32</Namespace>
+      <Exclude>CoreWebView2EnvironmentOptions</Exclude>
+    </Partition>
+  </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="Microsoft.Web.WebView2" Version="$(WinmdVersion)" GeneratePathProperty="true"/>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.WebView2" Version="$(WinmdVersion)" GeneratePathProperty="true"/>
+  </ItemGroup>

-    <Import Project="..\sdk\sdk.targets" />
+  <Import Project="..\sdk\sdk.targets" />
 </Project>
--- a/sources/msbuild/WebView2SampleDebug/nuget.config
+++ b/sources/msbuild/WebView2SampleDebug/nuget.config
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-  <disabledPackageSources>
-    <clear />
-  </disabledPackageSources>
-</configuration>
--- a/sources/msbuild/nuget/BuildSdk.nuspec
+++ b/sources/msbuild/nuget/BuildSdk.nuspec
@ -26,9 +26,9 @@
      <file src="tools\link.exe" target="tools"/>
      <file src="tools\tbbmalloc.dll" target="tools"/>

-      <file src="bin\release\netcoreapp3.1\*.deps.json" target="tools\netcoreapp3.1"/>
-      <file src="bin\release\netcoreapp3.1\*.runtimeconfig.json" target="tools\netcoreapp3.1"/>
-      <file src="bin\release\netcoreapp3.1\*.dll" target="tools\netcoreapp3.1" />
+      <file src="bin\release\net5.0\*.deps.json" target="tools\net5.0"/>
+      <file src="bin\release\net5.0\*.runtimeconfig.json" target="tools\net5.0"/>
+      <file src="bin\release\net5.0\*.dll" target="tools\net5.0" />
      <file src="scripts\InstallTools.ps1" target="scripts"/>
      <file src="scripts\ConvertMidlAttributesToSalAnnotations.ps1" target="scripts"/>
      <file src="scripts\GetVcDirPath.ps1" target="scripts"/>
--- a/sources/msbuild/nuget/BuildSdk.proj
+++ b/sources/msbuild/nuget/BuildSdk.proj
@ -5,17 +5,17 @@

  <Target Name="StampPropsFile" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
    <PropertyGroup>
-        <StampPropsScript>
-            $(PowerShell)
+      <StampPropsScript>
+        $(PowerShell)

-            $mainNugetVersion = nbgv get-version -v NuGetPackageVersion -p ..\..\..
-            . ..\..\..\scripts\CommonUtils.ps1
+        $mainNugetVersion = nbgv get-version -v NuGetPackageVersion -p ..\..\..
+        . ..\..\..\scripts\CommonUtils.ps1

-            copy ..\sdk\sdk.props ..\sdk\sdk.stamped.props
+        copy ..\sdk\sdk.props ..\sdk\sdk.stamped.props

-            [hashtable]$textToReplaceTable = @{ "10.0.19041.202-preview" = $mainNugetVersion }
-            Replace-Text "..\sdk\sdk.stamped.props" $textToReplaceTable
-        </StampPropsScript>
+        [hashtable]$textToReplaceTable = @{ "10.0.19041.202-preview" = $mainNugetVersion }
+        Replace-Text "..\sdk\sdk.stamped.props" $textToReplaceTable
+      </StampPropsScript>
    </PropertyGroup>

    <Exec Command="$(StampPropsScript)" EchoOff="false" />
@ -36,4 +36,4 @@
    <NuspecBasePath>..\..\..</NuspecBasePath>
    <PackageType>MSBuildSdk</PackageType>
  </PropertyGroup>
-</Project>
+</Project>
--- a/sources/msbuild/sdk/sdk.props
+++ b/sources/msbuild/sdk/sdk.props
@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Build.NoTargets/3.0.4">
-    <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-        <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    </PropertyGroup>
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
+  </PropertyGroup>

-    <PropertyGroup>
-        <Win32MetadataSdkRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..'))</Win32MetadataSdkRoot>
-        <TaskBinDir Condition="'$(TaskBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\netcoreapp3.1</TaskBinDir>
-        <ToolsBinDir Condition="'$(ToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\netcoreapp3.1</ToolsBinDir>
-        <LibToolsBinDir Condition="'$(LibToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools</LibToolsBinDir>
-        <ScriptsDir Condition="'$(ScriptsDir)' == ''">$(Win32MetadataSdkRoot)\scripts</ScriptsDir>
-        <ObjDir Condition="'$(ObjDir)' == ''">$(MSBuildProjectDirectory)\obj</ObjDir>
-        <CompiledHeadersDir Condition="'$(CompiledHeadersDir)' == ''">$(ObjDir)\CompiledHeaders</CompiledHeadersDir>
-        <SdkIncRoot>$(TargetPlatformSdkRootOverride)\include\$(TargetPlatformVersion)</SdkIncRoot>
-        <Win32MetadataScraperAssetsDir Condition="'$(Win32MetadataScraperAssetsDir)' == ''">$(Win32MetadataSdkRoot)\tools\assets</Win32MetadataScraperAssetsDir>
-        <Win32MetadataScraperGeneratedAssetsDir Condition="'$(Win32MetadataScraperGeneratedAssetsDir)' == ''">$(Win32MetadataSdkRoot)\tools\assets</Win32MetadataScraperGeneratedAssetsDir>
-        <Win32WinmdBinDir Condition="'$(Win32WinmdBinDir)' == ''">$(PkgMicrosoft_Windows_SDK_Win32Metadata)</Win32WinmdBinDir>
-        <PowerShell># 2>nul || type %~df0|find /v "setlocal"|find /v "errorlevel"|powershell.exe -noninteractive -&amp; exit %errorlevel% || #</PowerShell>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Win32MetadataSdkRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..'))</Win32MetadataSdkRoot>
+    <TaskBinDir Condition="'$(TaskBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\net5.0</TaskBinDir>
+    <ToolsBinDir Condition="'$(ToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\net5.0</ToolsBinDir>
+    <LibToolsBinDir Condition="'$(LibToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools</LibToolsBinDir>
+    <ScriptsDir Condition="'$(ScriptsDir)' == ''">$(Win32MetadataSdkRoot)\scripts</ScriptsDir>
+    <ObjDir Condition="'$(ObjDir)' == ''">$(MSBuildProjectDirectory)\obj</ObjDir>
+    <CompiledHeadersDir Condition="'$(CompiledHeadersDir)' == ''">$(ObjDir)\CompiledHeaders</CompiledHeadersDir>
+    <SdkIncRoot>$(TargetPlatformSdkRootOverride)\include\$(TargetPlatformVersion)</SdkIncRoot>
+    <Win32MetadataScraperAssetsDir Condition="'$(Win32MetadataScraperAssetsDir)' == ''">$(Win32MetadataSdkRoot)\tools\assets</Win32MetadataScraperAssetsDir>
+    <Win32MetadataScraperGeneratedAssetsDir Condition="'$(Win32MetadataScraperGeneratedAssetsDir)' == ''">$(Win32MetadataSdkRoot)\tools\assets</Win32MetadataScraperGeneratedAssetsDir>
+    <Win32WinmdBinDir Condition="'$(Win32WinmdBinDir)' == ''">$(PkgMicrosoft_Windows_SDK_Win32Metadata)</Win32WinmdBinDir>
+    <PowerShell># 2>nul || type %~df0|find /v "setlocal"|find /v "errorlevel"|powershell.exe -noninteractive -&amp; exit %errorlevel% || #</PowerShell>
+  </PropertyGroup>

-    <ItemGroup>
-        <PackageReference Include="Microsoft.Windows.SDK.CPP" Version="10.0.19041.5" GeneratePathProperty="true"/>
-        <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="10.0.19041.202-preview" GeneratePathProperty="true"/>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.CPP" Version="10.0.19041.5" GeneratePathProperty="true"/>
+    <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="10.0.19041.202-preview" GeneratePathProperty="true"/>
+  </ItemGroup>
 </Project>
--- a/sources/msbuild/sdk/sdk.targets
+++ b/sources/msbuild/sdk/sdk.targets
@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <UsingTask TaskName="MetadataTasks.ScanLibs" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
-    <UsingTask TaskName="MetadataTasks.ScrapeHeaders" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
-    <UsingTask TaskName="MetadataTasks.EmitWinmd" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
-    <UsingTask TaskName="MetadataTasks.CompileIdls" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
+  <UsingTask TaskName="MetadataTasks.ScanLibs" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
+  <UsingTask TaskName="MetadataTasks.ScrapeHeaders" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
+  <UsingTask TaskName="MetadataTasks.EmitWinmd" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>
+  <UsingTask TaskName="MetadataTasks.CompileIdls" AssemblyFile="$(TaskBinDir)\MetadataTasks.dll"/>

-    <Target Name="ScrapeAndEmit" AfterTargets="Build">
-        <PropertyGroup>
-            <InstallToolsScript>
-                $(PowerShell)
+  <Target Name="ScrapeAndEmit" AfterTargets="Build">
+    <PropertyGroup>
+      <InstallToolsScript>
+          $(PowerShell)

-                $(ScriptsDir)\InstallTools.ps1
-            </InstallToolsScript>
-        </PropertyGroup>
+          $(ScriptsDir)\InstallTools.ps1
+      </InstallToolsScript>
+    </PropertyGroup>

-        <Exec Command="$(InstallToolsScript)" EchoOff="false" />
+    <Exec Command="$(InstallToolsScript)" EchoOff="false" />

-        <CompileIdls
-            Idls="@(Idls)"
-            ObjDir="$(ObjDir)"
-            CompiledHeadersDir="$(CompiledHeadersDir)"
-            ScriptsDir="$(ScriptsDir)"
-            SdkIncRoot="$(SdkIncRoot)"
-            SdkBinDir="$(WindowsSDKVersionedBinRoot)"
-            AdditionalIncludes="$(AdditionalIncludes)"
-            MSBuildProjectDirectory="$(MSBuildProjectDirectory)"/>
-        <ScanLibs
-            Libs="@(ImportLibs)"
-            LibToolsBinDir="$(LibToolsBinDir)"
-            MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
-            <Output
-                TaskParameter="OutputLibRsp"
-                ItemName="ScraperRsp"/>
-        </ScanLibs>
-        <ScrapeHeaders 
-            Partitions="@(Partition)"
-            Rsps="@(ScraperRsp)"
-            ObjDir="$(ObjDir)"
-            SdkIncRoot="$(SdkIncRoot)"
-            Win32MetadataScraperAssetsDir="$(Win32MetadataScraperAssetsDir)"
-            Win32MetadataScraperGeneratedAssetsDir="$(Win32MetadataScraperGeneratedAssetsDir)"
-            WinSdkRoot="$(TargetPlatformSdkRootOverride)"
-            ToolsBinDir="$(ToolsBinDir)"
-            AdditionalIncludes="$(AdditionalIncludes)"
-            MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
-            <Output 
-                TaskParameter="GeneratedSourceDir"
-                PropertyName="EmitterSourceDir" />
-        </ScrapeHeaders>
-        <EmitWinmd
-            Libs="@(ImportLibs)"
-            EmitterSourceDir="$(EmitterSourceDir)"
-            ToolsBinDir="$(ToolsBinDir)"
-            Win32WinmdBinDir="$(Win32WinmdBinDir)"
-            WinmdVersion="$(WinmdVersion)"
-            OutputWinmd="$(OutputWinmd)"
-            MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
-        </EmitWinmd>
-    </Target>
+    <CompileIdls
+      Idls="@(Idls)"
+      ObjDir="$(ObjDir)"
+      CompiledHeadersDir="$(CompiledHeadersDir)"
+      ScriptsDir="$(ScriptsDir)"
+      SdkIncRoot="$(SdkIncRoot)"
+      SdkBinDir="$(WindowsSDKVersionedBinRoot)"
+      AdditionalIncludes="$(AdditionalIncludes)"
+      MSBuildProjectDirectory="$(MSBuildProjectDirectory)"/>
+    <ScanLibs
+      Libs="@(ImportLibs)"
+      LibToolsBinDir="$(LibToolsBinDir)"
+      MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
+      <Output
+        TaskParameter="OutputLibRsp"
+        ItemName="ScraperRsp"/>
+    </ScanLibs>
+    <ScrapeHeaders
+      Partitions="@(Partition)"
+      Rsps="@(ScraperRsp)"
+      ObjDir="$(ObjDir)"
+      SdkIncRoot="$(SdkIncRoot)"
+      Win32MetadataScraperAssetsDir="$(Win32MetadataScraperAssetsDir)"
+      Win32MetadataScraperGeneratedAssetsDir="$(Win32MetadataScraperGeneratedAssetsDir)"
+      WinSdkRoot="$(TargetPlatformSdkRootOverride)"
+      ToolsBinDir="$(ToolsBinDir)"
+      AdditionalIncludes="$(AdditionalIncludes)"
+      MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
+      <Output
+        TaskParameter="GeneratedSourceDir"
+        PropertyName="EmitterSourceDir" />
+    </ScrapeHeaders>
+    <EmitWinmd
+      Libs="@(ImportLibs)"
+      EmitterSourceDir="$(EmitterSourceDir)"
+      ToolsBinDir="$(ToolsBinDir)"
+      Win32WinmdBinDir="$(Win32WinmdBinDir)"
+      WinmdVersion="$(WinmdVersion)"
+      OutputWinmd="$(OutputWinmd)"
+      MSBuildProjectDirectory="$(MSBuildProjectDirectory)">
+    </EmitWinmd>
+  </Target>

-    <Target Name = "Clean">
-        <RemoveDir Directories="obj;bin" />
-    </Target>
+  <Target Name = "Clean">
+    <RemoveDir Directories="obj;bin" />
+  </Target>
 </Project>
--- a/sources/nuget/Microsoft.Windows.SDK.Win32Metadata/Win32MetadataNuget.proj
+++ b/sources/nuget/Microsoft.Windows.SDK.Win32Metadata/Win32MetadataNuget.proj
@ -12,5 +12,6 @@
    <NuspecFile>Microsoft.Windows.SDK.Win32Metadata.nuspec</NuspecFile>
    <NuspecProperties></NuspecProperties>
    <NuspecBasePath>..\..\..</NuspecBasePath>
+    <NoWarn>$(NoWarn);NU5100;NU5127</NoWarn>
  </PropertyGroup>
-</Project>
+</Project>
				`@ -1,2 +0,0 @@`
				`.\tools\nuget.exe pack .\sources\nuget\Microsoft.Windows.SDK.Win32Metadata\Microsoft.Windows.SDK.Win32Metadata.nuspec -version 10.0.20195.1001-preview.rs-onecore-dep -BasePath . -verbosity Detailed -OutputDirectory $env:TEMP`