diff --git a/samples/ConnectionValidationSample/ConnectionValidationSample.csproj b/samples/ConnectionValidationSample/ConnectionValidationSample.csproj index 7da59dfe3d..396c6a67af 100644 --- a/samples/ConnectionValidationSample/ConnectionValidationSample.csproj +++ b/samples/ConnectionValidationSample/ConnectionValidationSample.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 10.0.17763.0 enable enable diff --git a/samples/MinimalCallers/C#/Configuration-InProc/C#_Configuration_InProc.csproj b/samples/MinimalCallers/C#/Configuration-InProc/C#_Configuration_InProc.csproj index a7451e039b..da53066905 100644 --- a/samples/MinimalCallers/C#/Configuration-InProc/C#_Configuration_InProc.csproj +++ b/samples/MinimalCallers/C#/Configuration-InProc/C#_Configuration_InProc.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.22000.0 + net10.0-windows10.0.22000.0 Configuration_InProc enable enable diff --git a/samples/MinimalCallers/C#/Configuration-OutOfProc/C#_Configuration_OutOfProc.csproj b/samples/MinimalCallers/C#/Configuration-OutOfProc/C#_Configuration_OutOfProc.csproj index a068327805..1c63821417 100644 --- a/samples/MinimalCallers/C#/Configuration-OutOfProc/C#_Configuration_OutOfProc.csproj +++ b/samples/MinimalCallers/C#/Configuration-OutOfProc/C#_Configuration_OutOfProc.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.22000.0 + net10.0-windows10.0.22000.0 Configuration_OutOfProc enable enable diff --git a/samples/MinimalCallers/C#/WinGet-InProc/C#_WinGet_InProc.csproj b/samples/MinimalCallers/C#/WinGet-InProc/C#_WinGet_InProc.csproj index e8751a76f2..6b170a6d50 100644 --- a/samples/MinimalCallers/C#/WinGet-InProc/C#_WinGet_InProc.csproj +++ b/samples/MinimalCallers/C#/WinGet-InProc/C#_WinGet_InProc.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.22000.0 + net10.0-windows10.0.22000.0 WinGet_InProc enable enable diff --git a/samples/MinimalCallers/C#/WinGet-OutOfProc/C#_WinGet_OutOfProc.csproj b/samples/MinimalCallers/C#/WinGet-OutOfProc/C#_WinGet_OutOfProc.csproj index a4f1d73bee..bcd19d70cd 100644 --- a/samples/MinimalCallers/C#/WinGet-OutOfProc/C#_WinGet_OutOfProc.csproj +++ b/samples/MinimalCallers/C#/WinGet-OutOfProc/C#_WinGet_OutOfProc.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.22000.0 + net10.0-windows10.0.22000.0 WinGet_OutOfProc enable enable diff --git a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj index 5221e84792..a99a99e245 100644 --- a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj +++ b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj @@ -1,7 +1,7 @@ - + - net8.0-windows + net10.0-windows7.0 $(SolutionDir)$(Platform)\$(Configuration)\AppInstallerCLIE2ETests\ false x64;x86 diff --git a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj index 020eb52aad..50737bb021 100644 --- a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj +++ b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj @@ -253,7 +253,7 @@ Microsoft.Management.Configuration.winmd - + $(WinGetDotNetDirectoryName) true diff --git a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj index 8969d43170..4693c04d50 100644 --- a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj +++ b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 enable enable 10.0.17763.0 diff --git a/src/IndexCreationTool/IndexCreationTool.csproj b/src/IndexCreationTool/IndexCreationTool.csproj index 67af2a7683..481c41111a 100644 --- a/src/IndexCreationTool/IndexCreationTool.csproj +++ b/src/IndexCreationTool/IndexCreationTool.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 $(SolutionDir)$(Platform)\$(Configuration)\IndexCreationTool\ x64;x86 diff --git a/src/LocalhostWebServer/LocalhostWebServer.csproj b/src/LocalhostWebServer/LocalhostWebServer.csproj index e630d6c9d6..e2fe453070 100644 --- a/src/LocalhostWebServer/LocalhostWebServer.csproj +++ b/src/LocalhostWebServer/LocalhostWebServer.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.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 9dd8a0c5d8..958db8fc8d 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\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.winmd" +$Local:winmdTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net10.0-windows10.0.26100.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\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.dll" +$Local:dllTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net10.0-windows10.0.26100.0\Microsoft.Management.Configuration.dll" Copy-Item $Local:dllSourcePath $Local:dllTargetPath -Force diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Run-ConfigurationOOPTests.ps1 b/src/Microsoft.Management.Configuration.OutOfProc/Run-ConfigurationOOPTests.ps1 index 5a9247eb28..597b3d5f72 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Run-ConfigurationOOPTests.ps1 +++ b/src/Microsoft.Management.Configuration.OutOfProc/Run-ConfigurationOOPTests.ps1 @@ -53,7 +53,7 @@ if (-not (Test-Path $Local:vstestPath)) } # Step 3: Run the tests with vstest -$Local:testDll = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.UnitTests.dll" +$Local:testDll = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net10.0-windows10.0.26100.0\Microsoft.Management.Configuration.UnitTests.dll" $Local:vstestArgs = @( $Local:testDll, 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 047632421a..897b40db56 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 @@ - net8.0 + net10.0 $(DotNetVersion)-windows10.0.26100.0 enable 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 33801cfe17..439cd1ee50 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 @@ - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 AnyCpu enable enable diff --git a/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs b/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs index 776458c701..a11f0ff264 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\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.UnitTests.dll" --TestCaseFilter:Category=OutOfProc + // .\vstest.console.exe "\src\x64\Debug\Microsoft.Management.Configuration.UnitTests\net10.0-windows10.0.26100.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 97e0a38144..093d95c049 100644 --- a/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj +++ b/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj @@ -1,7 +1,7 @@ - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 enable 10.0.17763.0 x64;x86;arm64 diff --git a/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj b/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj index be26da6d44..f1a04fb69c 100644 --- a/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj +++ b/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj @@ -1,7 +1,7 @@ - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 AnyCpu enable enable 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 6fc74dcc20..dba014bb68 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 @@ - net8.0-windows + net10.0-windows $(SolutionDir)$(Platform)\$(Configuration)\Microsoft.Management.Deployment.Projection\ false x64;x86;arm64 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 241605f9ba..ecc5539da9 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 @@ - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 false net48 Debug;Release;ReleaseStatic 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 a8a800abb3..86568e2494 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.26100.0 - net8.0-windows$(TargetWindowsVersion) + net10.0-windows$(TargetWindowsVersion) false net48 Debug;Release;ReleaseStatic 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 2603df2cfa..c94f7874e2 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') { - "net8.0-windows10.0.26100.0\Microsoft.WinGet.Client.Cmdlets.dll" + "net10.0-windows10.0.26100.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 0dfd17981c..13593ed282 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 @@ - net8.0-windows10.0.26100 + net10.0-windows10.0.26100 false $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ true 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 8fef1854c7..2278d38060 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 @@ - net8.0-windows10.0.26100 + net10.0-windows10.0.26100 false enable $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/src/PowerShell/Microsoft.WinGet.UnitTests/Microsoft.WinGet.UnitTests.csproj b/src/PowerShell/Microsoft.WinGet.UnitTests/Microsoft.WinGet.UnitTests.csproj index 5934e209fd..e56634985c 100644 --- a/src/PowerShell/Microsoft.WinGet.UnitTests/Microsoft.WinGet.UnitTests.csproj +++ b/src/PowerShell/Microsoft.WinGet.UnitTests/Microsoft.WinGet.UnitTests.csproj @@ -1,7 +1,7 @@  - net8.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 false true enable diff --git a/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 b/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 index d1a2742a5e..5112a385a9 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, "net8.0-windows10.0.26100.0\SharedDependencies", $BuildRoot, $Configuration) + $module.AddArchSpecificFiles($additionalFiles, "net10.0-windows10.0.26100.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\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll" + "Microsoft.Management.Configuration.Projection\net10.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll" ) $module.AddAnyCpuSpecificFilesToArch($additionalFiles, "SharedDependencies", $BuildRoot, $Configuration) $modules += $module diff --git a/src/WinGetMCPServer/WinGetMCPServer.csproj b/src/WinGetMCPServer/WinGetMCPServer.csproj index e93e39b7d3..09c8396663 100644 --- a/src/WinGetMCPServer/WinGetMCPServer.csproj +++ b/src/WinGetMCPServer/WinGetMCPServer.csproj @@ -3,7 +3,7 @@ Exe 10.0.26100.0 - net8.0-windows$(TargetWindowsVersion) + net10.0-windows$(TargetWindowsVersion) enable enable 10.0.17763.0 diff --git a/src/WinGetSourceCreator/WinGetSourceCreator.csproj b/src/WinGetSourceCreator/WinGetSourceCreator.csproj index b68a80ca22..0dbf261420 100644 --- a/src/WinGetSourceCreator/WinGetSourceCreator.csproj +++ b/src/WinGetSourceCreator/WinGetSourceCreator.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 $(SolutionDir)$(Platform)\$(Configuration)\WinGetSourceCreator\ enable enable diff --git a/src/WinGetTestCommon/WinGetTestCommon.csproj b/src/WinGetTestCommon/WinGetTestCommon.csproj index 890f74acdb..cf83014f53 100644 --- a/src/WinGetTestCommon/WinGetTestCommon.csproj +++ b/src/WinGetTestCommon/WinGetTestCommon.csproj @@ -1,7 +1,7 @@  - net8.0-windows + net10.0-windows $(SolutionDir)$(Platform)\$(Configuration)\WinGetTestCommon\ x64;x86;arm64 Library diff --git a/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj b/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj index b79cb5acff..0a3e941c6d 100644 --- a/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj +++ b/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 $(SolutionDir)$(Platform)\$(Configuration)\WinGetUtilInterop.UnitTests\ x64;x86 diff --git a/templates/jobs-build.yml b/templates/jobs-build.yml index cf237f71c3..bcddf9406c 100644 --- a/templates/jobs-build.yml +++ b/templates/jobs-build.yml @@ -199,7 +199,7 @@ jobs: workingDirectory: '${{ parameters.sourceRoot }}\src' - task: CopyFiles@2 - displayName: 'Copy native binaries for Microsoft.WinGet.Client (net8)' + displayName: 'Copy native binaries for Microsoft.WinGet.Client (net10)' inputs: SourceFolder: $(buildOutDir) Contents: | @@ -207,7 +207,7 @@ jobs: Microsoft.Management.Deployment\Microsoft.Management.Deployment.winmd WindowsPackageManager\WindowsPackageManager.dll UndockedRegFreeWinRT\winrtact.dll - TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net8.0-windows10.0.26100.0\SharedDependencies\$(BuildPlatform) + TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net10.0-windows10.0.26100.0\SharedDependencies\$(BuildPlatform) flattenFolders: true - task: CopyFiles@2 @@ -236,14 +236,14 @@ jobs: inputs: SourceFolder: $(buildOutDirAnyCpu) Contents: | - Microsoft.Management.Configuration.Projection\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll + Microsoft.Management.Configuration.Projection\net10.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Configuration\SharedDependencies\$(BuildPlatform) flattenFolders: true - task: CopyFiles@2 displayName: 'Copy Microsoft.WinGet.UnitTests AnyCPU Files' inputs: - SourceFolder: '$(buildOutDirAnyCpu)\Microsoft.WinGet.UnitTests\net8.0-windows10.0.26100.0' + SourceFolder: '$(buildOutDirAnyCpu)\Microsoft.WinGet.UnitTests\net10.0-windows10.0.26100.0' TargetFolder: '$(artifactsDir)\Microsoft.WinGet.UnitTests\' CleanTargetFolder: true OverWrite: true