From c2c922c4163fc1ebf78a68d93304dccc63c51035 Mon Sep 17 00:00:00 2001 From: JohnMcPMS Date: Wed, 18 Dec 2024 13:52:10 -0800 Subject: [PATCH] Update to .NET 8 and PS SDK 7.4 (#5078) ## Change .NET 6 and PowerShell SDK 7.2 are no longer supported. This change updates the uses of the PowerShell SDK to 7.4 and all .NET 6 projects to .NET 8. --- azure-pipelines.yml | 8 ++++---- .../AppInstallerCLICore.vcxproj | 2 +- .../AppInstallerCLIE2ETests.csproj | 11 +++-------- .../AppInstallerCLIPackage.wapproj | 11 ++++------- .../ConfigurationRemotingServer.csproj | 18 +++++++----------- src/IndexCreationTool/IndexCreationTool.csproj | 4 ++-- .../LocalhostWebServer.csproj | 4 ++-- .../Prepare-ConfigurationOOPTests.ps1 | 4 ++-- ...t.Management.Configuration.Processor.csproj | 11 +++-------- ....Management.Configuration.Projection.csproj | 4 ++-- .../Helpers/OutOfProcAttribute.cs | 2 +- ...t.Management.Configuration.UnitTests.csproj | 11 +++++++---- .../Tests/OpenConfigurationSetTests.cs | 10 +++++----- ...oft.Management.Deployment.Projection.csproj | 4 ++-- .../Microsoft.WinGet.Client.Cmdlets.csproj | 6 +++--- .../Microsoft.WinGet.Client.Engine.csproj | 6 +++--- .../ModuleFiles/Microsoft.WinGet.Client.psd1 | 2 +- ...crosoft.WinGet.Configuration.Cmdlets.csproj | 4 ++-- ...icrosoft.WinGet.Configuration.Engine.csproj | 4 ++-- .../Microsoft.WinGet.Configuration.psd1 | 2 +- .../scripts/Initialize-LocalWinGetModules.ps1 | 4 ++-- .../WinGetSourceCreator.csproj | 6 ++++-- .../WinGetUtilInterop.UnitTests.csproj | 4 +++- 23 files changed, 66 insertions(+), 76 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 359568312a..e41f4536da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,7 +175,7 @@ jobs: TargetFolder: '$(artifactsDir)\AppxPackages' - task: CopyFiles@2 - displayName: 'Copy native binaries for Microsoft.WinGet.Client (net6)' + displayName: 'Copy native binaries for Microsoft.WinGet.Client (net8)' inputs: SourceFolder: $(buildOutDir) Contents: | @@ -183,7 +183,7 @@ jobs: Microsoft.Management.Deployment\Microsoft.Management.Deployment.winmd WindowsPackageManager\WindowsPackageManager.dll UndockedRegFreeWinRT\winrtact.dll - TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net6.0-windows10.0.22000.0\SharedDependencies\$(BuildPlatform) + TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net8.0-windows10.0.22000.0\SharedDependencies\$(BuildPlatform) flattenFolders: true - task: CopyFiles@2 @@ -212,7 +212,7 @@ jobs: inputs: SourceFolder: $(buildOutDirAnyCpu) Contents: | - Microsoft.Management.Configuration.Projection\net6.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll + Microsoft.Management.Configuration.Projection\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Configuration\SharedDependencies\$(BuildPlatform) flattenFolders: true @@ -237,7 +237,7 @@ jobs: - task: CopyFiles@2 displayName: 'Copy Files: WinGetUtilInterop.UnitTests' inputs: - SourceFolder: '$(Build.SourcesDirectory)\src\WinGetUtilInterop.UnitTests\bin\$(buildPlatform)\$(BuildConfiguration)\net6.0' + SourceFolder: '$(Build.SourcesDirectory)\src\WinGetUtilInterop.UnitTests\bin\$(buildPlatform)\$(BuildConfiguration)\net8.0' TargetFolder: '$(artifactsDir)\WinGetUtilInterop.UnitTests\' CleanTargetFolder: true OverWrite: true diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index 45c9c0fa04..f78059aafb 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -549,7 +549,7 @@ $(SolutionDir)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Processor\Microsoft.Management.Configuration.Processor.winmd - $(SolutionDir)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Processor\net6.0-windows10.0.22000.0\win\Microsoft.Management.Configuration.Processor.winmd + $(SolutionDir)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Processor\net8.0-windows10.0.22000.0\win\Microsoft.Management.Configuration.Processor.winmd diff --git a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj index 179ffb1583..6c224bf06f 100644 --- a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj +++ b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows $(SolutionDir)$(Platform)\$(Configuration)\AppInstallerCLIE2ETests\ false x64;x86 @@ -11,7 +11,7 @@ - 10.0.22000.52 + 10.0.22000.53 @@ -25,7 +25,7 @@ - + @@ -38,11 +38,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - diff --git a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj index 06a24b4e09..a9e40fc31e 100644 --- a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj +++ b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj @@ -217,17 +217,14 @@ copy "$(TargetDir)\resources.pri" "$(TargetDir)\AppInstallerCLI\resources.pri" - - win10-arm - - win10-arm64 + win-arm64 - win10-x64 + win-x64 - win10-x86 + win-x86 @@ -253,7 +250,7 @@ ConfigurationRemotingServer\Microsoft.Management.Configuration.Projection.dll - + ConfigurationRemotingServer true diff --git a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj index 52957466c2..ca9fdb50ed 100644 --- a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj +++ b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj @@ -2,34 +2,30 @@ Exe - net6.0-windows10.0.22000.0 + net8.0-windows10.0.22000.0 enable enable 10.0.17763.0 - x64;x86;arm;arm64 + x64;x86;arm64 $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ true - win10-x64;win10-x86;win10-arm;win10-arm64 + win-x64;win-x86;win-arm64 - 10.0.22000.52 + 10.0.22000.53 - win10-x64 + win-x64 - win10-x86 - - - - win10-arm + win-x86 - win10-arm64 + win-arm64 diff --git a/src/IndexCreationTool/IndexCreationTool.csproj b/src/IndexCreationTool/IndexCreationTool.csproj index 79a4d0812b..4025eeb1f4 100644 --- a/src/IndexCreationTool/IndexCreationTool.csproj +++ b/src/IndexCreationTool/IndexCreationTool.csproj @@ -1,8 +1,8 @@ - + Exe - net6.0 + net8.0 $(SolutionDir)$(Platform)\$(Configuration)\IndexCreationTool\ x64;x86 diff --git a/src/LocalhostWebServer/LocalhostWebServer.csproj b/src/LocalhostWebServer/LocalhostWebServer.csproj index b4ae8ba832..e963674a20 100644 --- a/src/LocalhostWebServer/LocalhostWebServer.csproj +++ b/src/LocalhostWebServer/LocalhostWebServer.csproj @@ -1,7 +1,7 @@ - + - net6.0 + net8.0 $(SolutionDir)$(Platform)\$(Configuration)\LocalhostWebServer\ x64;x86 diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 b/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 index c445699d5e..c3c24d8bac 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 +++ b/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 @@ -9,13 +9,13 @@ param( # Copy the winmd into the unit test directory since it will be needed for marshalling $Local:winmdSourcePath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration\Microsoft.Management.Configuration.winmd" -$Local:winmdTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net6.0-windows10.0.22000.0\Microsoft.Management.Configuration.winmd" +$Local:winmdTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.winmd" Copy-Item $Local:winmdSourcePath $Local:winmdTargetPath -Force # Copy the OOP helper dll into the unit test directory to make activation look the same as in-proc $Local:dllSourcePath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.OutOfProc\Microsoft.Management.Configuration.OutOfProc.dll" -$Local:dllTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net6.0-windows10.0.22000.0\Microsoft.Management.Configuration.dll" +$Local:dllTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.dll" Copy-Item $Local:dllSourcePath $Local:dllTargetPath -Force diff --git a/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj b/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj index b21a17f4e3..71319bc28e 100644 --- a/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj +++ b/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 $(DotNetVersion)-windows10.0.22000.0 enable @@ -21,7 +21,7 @@ - 10.0.22000.52 + 10.0.22000.53 @@ -43,18 +43,13 @@ - + contentFiles all - - - - - diff --git a/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj b/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj index c6d7ba6d5d..3671eb08ac 100644 --- a/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj +++ b/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj @@ -1,7 +1,7 @@ - net6.0-windows10.0.22000.0 + net8.0-windows10.0.22000.0 AnyCpu enable enable @@ -11,7 +11,7 @@ - 10.0.22000.52 + 10.0.22000.53 diff --git a/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs b/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs index 58c4b1491c..5450cc13b8 100644 --- a/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs +++ b/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs @@ -31,7 +31,7 @@ public OutOfProcAttribute() // The test runner is located somewhere like this: // C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\TestPlatform // and the command line from there is: - // .\vstest.console.exe "\src\x64\Debug\Microsoft.Management.Configuration.UnitTests\net6.0-windows10.0.22000.0\Microsoft.Management.Configuration.UnitTests.dll" --TestCaseFilter:Category=OutOfProc + // .\vstest.console.exe "\src\x64\Debug\Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.UnitTests.dll" --TestCaseFilter:Category=OutOfProc } } } diff --git a/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj b/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj index fa1c9c9a77..4cab06265a 100644 --- a/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj +++ b/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj @@ -1,16 +1,16 @@ - net6.0-windows10.0.22000.0 + net8.0-windows10.0.22000.0 enable 10.0.17763.0 x64;x86;arm64 $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - win10-x64;win10-x86;win10-arm;win10-arm64 + win-x64;win-x86;win-arm64 - 10.0.22000.52 + 10.0.22000.53 @@ -25,6 +25,9 @@ + + + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -39,7 +42,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microsoft.Management.Configuration.UnitTests/Tests/OpenConfigurationSetTests.cs b/src/Microsoft.Management.Configuration.UnitTests/Tests/OpenConfigurationSetTests.cs index 04de11440c..a2819bd93e 100644 --- a/src/Microsoft.Management.Configuration.UnitTests/Tests/OpenConfigurationSetTests.cs +++ b/src/Microsoft.Management.Configuration.UnitTests/Tests/OpenConfigurationSetTests.cs @@ -607,7 +607,7 @@ public void TestSet_Serialize_0_3() Assert.Equal(2, set.Units.Count); this.VerifyValueSet(set.Metadata, new KeyValuePair("description", "FakeSetDescription")); - this.VerifyValueSet(set.Variables, new("var1", "Test1"), new("var2", 42)); + this.VerifyValueSet(set.Variables, new ("var1", "Test1"), new ("var2", 42)); Assert.Equal(2, set.Parameters.Count); this.VerifyParameter(set.Parameters[0], "param1", Windows.Foundation.PropertyType.String, true); @@ -615,17 +615,17 @@ public void TestSet_Serialize_0_3() Assert.Equal("FakeModule/FakeResource", set.Units[0].Type); Assert.Equal("TestId", set.Units[0].Identifier); - this.VerifyValueSet(set.Units[0].Metadata, new("description", "FakeDescription"), new("allowPrerelease", true), new("securityContext", "elevated")); - this.VerifyValueSet(set.Units[0].Settings, new("TestString", "Hello"), new("TestBool", false), new("TestInt", 1234)); + this.VerifyValueSet(set.Units[0].Metadata, new ("description", "FakeDescription"), new ("allowPrerelease", true), new ("securityContext", "elevated")); + this.VerifyValueSet(set.Units[0].Settings, new ("TestString", "Hello"), new ("TestBool", false), new ("TestInt", 1234)); Assert.Equal("FakeModule2/FakeResource2", set.Units[1].Type); Assert.Equal("TestId2", set.Units[1].Identifier); this.VerifyStringArray(set.Units[1].Dependencies, "TestId", "dependency2", "dependency3"); - this.VerifyValueSet(set.Units[1].Metadata, new("description", "FakeDescription2"), new("securityContext", "elevated")); + this.VerifyValueSet(set.Units[1].Metadata, new ("description", "FakeDescription2"), new ("securityContext", "elevated")); ValueSet mapping = new ValueSet(); mapping.Add("Key", "TestValue"); - this.VerifyValueSet(set.Units[1].Settings, new("TestString", "Bye"), new("TestBool", true), new("TestInt", 4321), new("Mapping", mapping)); + this.VerifyValueSet(set.Units[1].Settings, new ("TestString", "Bye"), new ("TestBool", true), new ("TestInt", 4321), new ("Mapping", mapping)); } /// diff --git a/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj index 288b813059..b0260252c1 100644 --- a/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj +++ b/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj @@ -1,7 +1,7 @@ - net6.0-windows + net8.0-windows $(SolutionDir)$(Platform)\$(Configuration)\Microsoft.Management.Deployment.Projection\ false x64;x86;arm64 @@ -10,7 +10,7 @@ - 10.0.22000.52 + 10.0.22000.53 diff --git a/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj b/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj index 2df497ed92..ac1388d120 100644 --- a/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj @@ -3,7 +3,7 @@ - net6.0-windows10.0.22000.0 + net8.0-windows10.0.22000.0 false net48 Debug;Release;ReleaseStatic @@ -11,7 +11,7 @@ - 10.0.22000.52 + 10.0.22000.53 @@ -52,7 +52,7 @@ - win10 + win diff --git a/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj b/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj index 3998fe740f..13bd34b2ea 100644 --- a/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj @@ -4,7 +4,7 @@ 10.0.22000.0 - net6.0-windows$(TargetWindowsVersion) + net8.0-windows$(TargetWindowsVersion) false net48 Debug;Release;ReleaseStatic @@ -12,7 +12,7 @@ - 10.0.22000.52 + 10.0.22000.53 @@ -94,7 +94,7 @@ - win10 + win diff --git a/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 b/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 index 3ac00bf044..f6b95ab9fe 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 +++ b/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 @@ -9,7 +9,7 @@ # Script module or binary module file associated with this manifest. RootModule = if ($PSEdition -like 'Core') { - "net6.0-windows10.0.22000.0\Microsoft.WinGet.Client.Cmdlets.dll" + "net8.0-windows10.0.22000.0\Microsoft.WinGet.Client.Cmdlets.dll" } else { diff --git a/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj b/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj index eebc4a756c..5badbfe17c 100644 --- a/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj +++ b/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj @@ -2,7 +2,7 @@ - net6.0-windows10.0.22000 + net8.0-windows10.0.22000 false $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ true @@ -15,7 +15,7 @@ - 10.0.22000.52 + 10.0.22000.53 diff --git a/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj b/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj index ebddf5f91b..93b1fdb179 100644 --- a/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj +++ b/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj @@ -2,7 +2,7 @@ - net6.0-windows10.0.22000 + net8.0-windows10.0.22000 false enable $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ @@ -14,7 +14,7 @@ - 10.0.22000.52 + 10.0.22000.53 diff --git a/src/PowerShell/Microsoft.WinGet.Configuration/ModuleFiles/Microsoft.WinGet.Configuration.psd1 b/src/PowerShell/Microsoft.WinGet.Configuration/ModuleFiles/Microsoft.WinGet.Configuration.psd1 index b652ad1df9..9349bc6576 100644 --- a/src/PowerShell/Microsoft.WinGet.Configuration/ModuleFiles/Microsoft.WinGet.Configuration.psd1 +++ b/src/PowerShell/Microsoft.WinGet.Configuration/ModuleFiles/Microsoft.WinGet.Configuration.psd1 @@ -7,7 +7,7 @@ CompanyName = 'Microsoft Corporation' Copyright = '(c) Microsoft Corporation. All rights reserved.' Description = 'PowerShell Module for the Windows Package Manager Configuration.' - PowerShellVersion = '7.2.8' + PowerShellVersion = '7.4.6' FunctionsToExport = @() AliasesToExport = @('cmpwgc', 'cnwgc', 'ctwgcy', 'gwgc', 'gwgcd', 'iwgc', 'rwgch', 'sawgc', 'spwgc','twgc') diff --git a/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 b/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 index 8f69e334c5..4e5cedb3d9 100644 --- a/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 +++ b/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 @@ -202,7 +202,7 @@ if ($moduleToConfigure.HasFlag([ModuleType]::Client)) "WindowsPackageManager\WindowsPackageManager.dll" "UndockedRegFreeWinRT\winrtact.dll" ) - $module.AddArchSpecificFiles($additionalFiles, "net6.0-windows10.0.22000.0\SharedDependencies", $BuildRoot, $Configuration) + $module.AddArchSpecificFiles($additionalFiles, "net8.0-windows10.0.22000.0\SharedDependencies", $BuildRoot, $Configuration) $module.AddArchSpecificFiles($additionalFiles, "net48\SharedDependencies", $BuildRoot, $Configuration) $modules += $module } @@ -226,7 +226,7 @@ if ($moduleToConfigure.HasFlag([ModuleType]::Configuration)) ) $module.AddArchSpecificFiles($additionalFiles, "SharedDependencies", $BuildRoot, $Configuration) $additionalFiles = @( - "Microsoft.Management.Configuration.Projection\net6.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll" + "Microsoft.Management.Configuration.Projection\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll" ) $module.AddAnyCpuSpecificFilesToArch($additionalFiles, "SharedDependencies", $BuildRoot, $Configuration) $modules += $module diff --git a/src/WinGetSourceCreator/WinGetSourceCreator.csproj b/src/WinGetSourceCreator/WinGetSourceCreator.csproj index c5fa565e94..38aa96151e 100644 --- a/src/WinGetSourceCreator/WinGetSourceCreator.csproj +++ b/src/WinGetSourceCreator/WinGetSourceCreator.csproj @@ -1,7 +1,7 @@ - + - net6.0 + net8.0 $(SolutionDir)$(Platform)\$(Configuration)\WinGetSourceCreator\ enable enable @@ -9,6 +9,8 @@ + + diff --git a/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj b/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj index 618c708bc4..5b8e0d0784 100644 --- a/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj +++ b/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 x64;x86 @@ -12,6 +12,8 @@ + +