Update tools to .NET 8. Fixed #1746.

2024-01-03 10:47:30 -08:00 · 2024-01-03 10:47:30 -08:00 · 78608fdf09
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -15,7 +15,7 @@
    <OutputPath>$(RepoRootPath)bin\$(Configuration)</OutputPath>
    <PackageOutputPath>$(MSBuildThisFileDirectory)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>

-    <LocalTaskBinDir>$(RepoRootPath)bin\$(Configuration)\net6.0\</LocalTaskBinDir>
+    <LocalTaskBinDir>$(RepoRootPath)bin\$(Configuration)\net8.0\</LocalTaskBinDir>

    <LangVersion>9</LangVersion>

--- a/apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj
+++ b/apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj
@ -23,7 +23,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\ScrapeDocs\ScrapeDocs.csproj" ReferenceOutputAssembly="false" OutputItemType="ScraperTool" SetTargetFramework="TargetFramework=net6.0" />
+    <ProjectReference Include="..\ScrapeDocs\ScrapeDocs.csproj" ReferenceOutputAssembly="false" OutputItemType="ScraperTool" SetTargetFramework="TargetFramework=net8.0" />
  </ItemGroup>

  <Import Project="Microsoft.Windows.SDK.Win32Docs.targets" />
--- a/apidocs/ScrapeDocs/ScrapeDocs.csproj
+++ b/apidocs/ScrapeDocs/ScrapeDocs.csproj
@ -3,15 +3,15 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <!-- Use plural TargetFrameworks here because we set the singular as a global property in a referencing project. -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
    <IsPackable>false</IsPackable>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
    <LangVersion>10.0</LangVersion>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
    <LangVersion>10.0</LangVersion>
  </PropertyGroup>

--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -219,10 +219,10 @@ jobs:
    condition: and(succeeded(), eq(variables['SignFiles'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))

  - task: EsrpCodeSigning@1
-    displayName: Authenticode sign net6.0 binaries in Generator SDK package
+    displayName: Authenticode sign net8.0 binaries in Generator SDK package
    inputs:
      ConnectedServiceName: 'Xlang Code Signing'
-      FolderPath: '$(Build.SourcesDirectory)\bin\$(BuildConfiguration)\net6.0'
+      FolderPath: '$(Build.SourcesDirectory)\bin\$(BuildConfiguration)\net8.0'
      Pattern: 'ClangSharpSourceToWinmd.dll,ConstantsScraper.dll,CsvHelper.dll,ICSharpCode.Decompiler.dll,MetadataTasks.dll,MetadataUtils.dll,WinmdUtils.dll'
      signConfigType: 'inlineSignParams'
      inlineOperation: |
--- a/generation/WinSDK/Windows.Win32.proj
+++ b/generation/WinSDK/Windows.Win32.proj
@ -5,7 +5,7 @@

  <!-- These are for debugging purposes only. A normal project wouldn't set these -->
  <PropertyGroup>
-    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net6.0</ToolsBinDir>
+    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net8.0</ToolsBinDir>
    <LibToolsBinDir>$(RepoRootPath)tools</LibToolsBinDir>
    <ScriptsDir>$(RepoRootPath)scripts</ScriptsDir>
    <Win32MetadataAssetsDir>$(RepoRootPath)sources\GeneratorSdk\tools\assets</Win32MetadataAssetsDir>
@ -36,7 +36,7 @@
  </ItemGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <OutputWinmd Condition="'$(OutputWinmd)' == ''">..\..\bin\Windows.Win32.winmd</OutputWinmd>
    <WinmdVersion Condition="'$(WinmdVersion)' == ''">1.0.0.0</WinmdVersion>
    <GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "6.0.417",
+    "version": "8.0.100",
    "allowPrerelease": false,
    "rollForward": "feature"
  },
--- a/scripts/CommonUtils.ps1
+++ b/scripts/CommonUtils.ps1
@ -8,7 +8,7 @@ $windowsWin32ProjectRoot = "$rootDir\generation\WinSDK"
 $sdkGeneratedSourceDir = "$windowsWin32ProjectRoot\obj\generated"
 $recompiledIdlHeadersDir = "$windowsWin32ProjectRoot\RecompiledIdlHeaders"
 $recompiledIdlHeadersScratchDir = "$rootDir\obj\RecompiledIdlHeaders"
-$metadataToolsBin = "$binDir\release\net6.0"
+$metadataToolsBin = "$binDir\release\net8.0"

 # [VS 1673159]
 # Temporarily disable strict mode to address bug introduced
--- a/scripts/Install-AllSoftware.ps1
+++ b/scripts/Install-AllSoftware.ps1
@ -27,7 +27,7 @@ else {
    Write-Host "Installing apps"
    $apps = @(
    @{packageID = "icsharpcode.ILSpy" },
-    @{packageID = "Microsoft.DotNet.SDK.6" },
+    @{packageID = "Microsoft.DotNet.SDK.8" },
    @{packageID = "Microsoft.VisualStudioCode" }
    );
    Foreach ($app in $apps) {
--- a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
+++ b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>

--- a/sources/ConstantsScraper/ConstantsScraper.csproj
+++ b/sources/ConstantsScraper/ConstantsScraper.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj
+++ b/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <WarningLevel>5</WarningLevel>
    <NoWarn>1701;1702;</NoWarn>
  </PropertyGroup>
--- a/sources/GeneratorSdk/MetadataTasks/ScrapeHeaders.cs
+++ b/sources/GeneratorSdk/MetadataTasks/ScrapeHeaders.cs
@ -12,7 +12,7 @@ namespace MetadataTasks
 {
    public class ScrapeHeaders : Task, ICancelableTask
    {
-        public const string ClangSharpVersion = "16.0";
+        public const string ClangSharpVersion = "17.0.1";

        private static readonly string[] allArches = new string[] { "x86", "x64", "arm64" };

--- a/sources/GeneratorSdk/nuget/BuildSdk.nuspec
+++ b/sources/GeneratorSdk/nuget/BuildSdk.nuspec
@ -22,9 +22,9 @@
    <file src="sources\GeneratorSdk\sdk\sdk.stamped.props" target="sdk\Sdk.props"/>
    <file src="sources\GeneratorSdk\sdk\sdk.targets" target="sdk\Sdk.targets"/>

-    <file src="bin\release\net6.0\*.deps.json" target="tools\net6.0"/>
-    <file src="bin\release\net6.0\*.runtimeconfig.json" target="tools\net6.0"/>
-    <file src="bin\release\net6.0\*.dll" target="tools\net6.0" />
+    <file src="bin\release\net8.0\*.deps.json" target="tools\net8.0"/>
+    <file src="bin\release\net8.0\*.runtimeconfig.json" target="tools\net8.0"/>
+    <file src="bin\release\net8.0\*.dll" target="tools\net8.0" />
    <file src="scripts\Install-DotNetTool.ps1" target="scripts"/>
    <file src="scripts\ConvertMidlAttributesToSalAnnotations.ps1" target="scripts"/>
    <file src="scripts\GetVcDirPath.ps1" target="scripts"/>
--- a/sources/GeneratorSdk/samples/GeneratorSampleDebug/GeneratorSampleDebug.proj
+++ b/sources/GeneratorSdk/samples/GeneratorSampleDebug/GeneratorSampleDebug.proj
@ -3,7 +3,7 @@

  <!-- These are for debugging purposes only. A normal project wouldn't set these -->
  <PropertyGroup>
-    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net6.0</ToolsBinDir>
+    <ToolsBinDir>$(RepoRootPath)bin\$(Configuration)\net8.0</ToolsBinDir>
    <LibToolsBinDir>$(RepoRootPath)tools</LibToolsBinDir>
    <ScriptsDir>$(RepoRootPath)scripts</ScriptsDir>
    <Win32MetadataAssetsDir>$(RepoRootPath)sources\GeneratorSdk\tools\assets</Win32MetadataAssetsDir>
--- a/sources/GeneratorSdk/sdk/sdk.props
+++ b/sources/GeneratorSdk/sdk/sdk.props
@ -7,7 +7,7 @@
  <Import Condition="'$(UsingMicrosoftNoTargetsSdk)' != 'true'" Sdk="Microsoft.Build.NoTargets" Version="3.0.4" Project="sdk.props"/>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
    <ScanArch>crossarch</ScanArch>
  </PropertyGroup>
@ -22,8 +22,8 @@

  <PropertyGroup>
    <Win32MetadataSdkRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..'))</Win32MetadataSdkRoot>
-    <TaskBinDir Condition="'$(TaskBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\net6.0</TaskBinDir>
-    <ToolsBinDir Condition="'$(ToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\net6.0</ToolsBinDir>
+    <TaskBinDir Condition="'$(TaskBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\net8.0</TaskBinDir>
+    <ToolsBinDir Condition="'$(ToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools\net8.0</ToolsBinDir>
    <LibToolsBinDir Condition="'$(LibToolsBinDir)' == ''">$(Win32MetadataSdkRoot)\tools</LibToolsBinDir>
    <ScriptsDir Condition="'$(ScriptsDir)' == ''">$(Win32MetadataSdkRoot)\scripts</ScriptsDir>
    <ObjDir Condition="'$(ObjDir)' == ''">$(MSBuildProjectDirectory)\obj</ObjDir>
--- a/sources/MetadataUtils/MetadataUtils.csproj
+++ b/sources/MetadataUtils/MetadataUtils.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)'=='Release'">
--- a/sources/PartitionUtils/PartitionUtils.csproj
+++ b/sources/PartitionUtils/PartitionUtils.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>

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

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj
+++ b/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj
+++ b/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>

    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/tests/TestCommon/TestCommon.csproj
+++ b/tests/TestCommon/TestCommon.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/tests/VtablesFromPdb/VtablesFromPdb.csproj
+++ b/tests/VtablesFromPdb/VtablesFromPdb.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj
+++ b/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>

    <IsPackable>false</IsPackable>
  </PropertyGroup>