diff --git a/Directory.Build.props b/Directory.Build.props index 9212b8ca..4a071ea4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,7 +15,7 @@ $(RepoRootPath)bin\$(Configuration) $(MSBuildThisFileDirectory)bin\Packages\$(Configuration)\NuGet\ - $(RepoRootPath)bin\$(Configuration)\net6.0\ + $(RepoRootPath)bin\$(Configuration)\net8.0\ 9 diff --git a/apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj b/apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj index a98d083c..a24b6787 100644 --- 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 @@ - + diff --git a/apidocs/ScrapeDocs/ScrapeDocs.csproj b/apidocs/ScrapeDocs/ScrapeDocs.csproj index 2420dbbc..79676fb1 100644 --- a/apidocs/ScrapeDocs/ScrapeDocs.csproj +++ b/apidocs/ScrapeDocs/ScrapeDocs.csproj @@ -3,15 +3,15 @@ Exe - net6.0 + net8.0 false - + 10.0 - + 10.0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8df35e38..a176876b 100644 --- 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: | diff --git a/generation/WinSDK/Windows.Win32.proj b/generation/WinSDK/Windows.Win32.proj index 707636d6..32cdedef 100644 --- a/generation/WinSDK/Windows.Win32.proj +++ b/generation/WinSDK/Windows.Win32.proj @@ -5,7 +5,7 @@ - $(RepoRootPath)bin\$(Configuration)\net6.0 + $(RepoRootPath)bin\$(Configuration)\net8.0 $(RepoRootPath)tools $(RepoRootPath)scripts $(RepoRootPath)sources\GeneratorSdk\tools\assets @@ -36,7 +36,7 @@ - net6.0 + net8.0 ..\..\bin\Windows.Win32.winmd 1.0.0.0 false diff --git a/global.json b/global.json index c3c6d758..facb362f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.417", + "version": "8.0.100", "allowPrerelease": false, "rollForward": "feature" }, diff --git a/scripts/CommonUtils.ps1 b/scripts/CommonUtils.ps1 index 19a20009..2ef861fc 100644 --- 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 diff --git a/scripts/Install-AllSoftware.ps1 b/scripts/Install-AllSoftware.ps1 index b3c59449..1d82aff4 100644 --- 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) { diff --git a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj index a897daf8..13e70069 100644 --- a/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj +++ b/sources/ClangSharpSourceToWinmd/ClangSharpSourceToWinmd.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true diff --git a/sources/ConstantsScraper/ConstantsScraper.csproj b/sources/ConstantsScraper/ConstantsScraper.csproj index 56994cc5..916dd372 100644 --- a/sources/ConstantsScraper/ConstantsScraper.csproj +++ b/sources/ConstantsScraper/ConstantsScraper.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj b/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj index 6fed8c9f..5a3f5a7e 100644 --- a/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj +++ b/sources/GeneratorSdk/MetadataTasks/MetadataTasks.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 5 1701;1702; diff --git a/sources/GeneratorSdk/MetadataTasks/ScrapeHeaders.cs b/sources/GeneratorSdk/MetadataTasks/ScrapeHeaders.cs index 1a876850..116c79d5 100644 --- 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" }; diff --git a/sources/GeneratorSdk/nuget/BuildSdk.nuspec b/sources/GeneratorSdk/nuget/BuildSdk.nuspec index 57c49a56..9e7adff5 100644 --- a/sources/GeneratorSdk/nuget/BuildSdk.nuspec +++ b/sources/GeneratorSdk/nuget/BuildSdk.nuspec @@ -22,9 +22,9 @@ - - - + + + diff --git a/sources/GeneratorSdk/samples/GeneratorSampleDebug/GeneratorSampleDebug.proj b/sources/GeneratorSdk/samples/GeneratorSampleDebug/GeneratorSampleDebug.proj index 271165e8..07628051 100644 --- a/sources/GeneratorSdk/samples/GeneratorSampleDebug/GeneratorSampleDebug.proj +++ b/sources/GeneratorSdk/samples/GeneratorSampleDebug/GeneratorSampleDebug.proj @@ -3,7 +3,7 @@ - $(RepoRootPath)bin\$(Configuration)\net6.0 + $(RepoRootPath)bin\$(Configuration)\net8.0 $(RepoRootPath)tools $(RepoRootPath)scripts $(RepoRootPath)sources\GeneratorSdk\tools\assets diff --git a/sources/GeneratorSdk/sdk/sdk.props b/sources/GeneratorSdk/sdk/sdk.props index bad9a89d..492fcf7b 100644 --- a/sources/GeneratorSdk/sdk/sdk.props +++ b/sources/GeneratorSdk/sdk/sdk.props @@ -7,7 +7,7 @@ - net6.0 + net8.0 Windows crossarch @@ -22,8 +22,8 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..')) - $(Win32MetadataSdkRoot)\tools\net6.0 - $(Win32MetadataSdkRoot)\tools\net6.0 + $(Win32MetadataSdkRoot)\tools\net8.0 + $(Win32MetadataSdkRoot)\tools\net8.0 $(Win32MetadataSdkRoot)\tools $(Win32MetadataSdkRoot)\scripts $(MSBuildProjectDirectory)\obj diff --git a/sources/MetadataUtils/MetadataUtils.csproj b/sources/MetadataUtils/MetadataUtils.csproj index fcdac8ed..f5a46f29 100644 --- a/sources/MetadataUtils/MetadataUtils.csproj +++ b/sources/MetadataUtils/MetadataUtils.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/sources/PartitionUtils/PartitionUtils.csproj b/sources/PartitionUtils/PartitionUtils.csproj index 26142036..6f00626b 100644 --- a/sources/PartitionUtils/PartitionUtils.csproj +++ b/sources/PartitionUtils/PartitionUtils.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/sources/WinmdUtils/WinmdUtils.csproj b/sources/WinmdUtils/WinmdUtils.csproj index 9d661c53..8dc06663 100644 --- a/sources/WinmdUtils/WinmdUtils.csproj +++ b/sources/WinmdUtils/WinmdUtils.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj b/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj index f44bd6bd..d099c931 100644 --- a/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj +++ b/tests/ClangSharpSourceToWinmdTests/ClangSharpSourceToWinmdTests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 enable false diff --git a/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj b/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj index 991f6d71..29044fa9 100644 --- a/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj +++ b/tests/MetadataUtils.Tests/MetadataUtils.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false diff --git a/tests/TestCommon/TestCommon.csproj b/tests/TestCommon/TestCommon.csproj index 351e524e..cc97cb60 100644 --- a/tests/TestCommon/TestCommon.csproj +++ b/tests/TestCommon/TestCommon.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/tests/VtablesFromPdb/VtablesFromPdb.csproj b/tests/VtablesFromPdb/VtablesFromPdb.csproj index 6afee797..30dcb3cb 100644 --- a/tests/VtablesFromPdb/VtablesFromPdb.csproj +++ b/tests/VtablesFromPdb/VtablesFromPdb.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj b/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj index c5f3886b..3b6f0e9f 100644 --- a/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj +++ b/tests/Windows.Win32.Tests/Windows.Win32.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false