commit c2c922c4163fc1ebf78a68d93304dccc63c51035 parent 08b6de092325578d10667ca8caec298c002f195b Author: JohnMcPMS <johnmcp@microsoft.com> Date: Wed, 18 Dec 2024 13:52:10 -0800 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. Diffstat:
23 files changed, 66 insertions(+), 76 deletions(-)
diff --git 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 @@ -549,7 +549,7 @@ <PropertyGroup> <!-- The output path for this project is different on some builds where the RIDs are not used in the output. --> <MicrosoftManagementConfigurationProcessorPath>$(SolutionDir)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Processor\Microsoft.Management.Configuration.Processor.winmd</MicrosoftManagementConfigurationProcessorPath> - <MicrosoftManagementConfigurationProcessorPath Condition="!Exists('$(MicrosoftManagementConfigurationProcessorPath)')">$(SolutionDir)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Processor\net6.0-windows10.0.22000.0\win\Microsoft.Management.Configuration.Processor.winmd</MicrosoftManagementConfigurationProcessorPath> + <MicrosoftManagementConfigurationProcessorPath Condition="!Exists('$(MicrosoftManagementConfigurationProcessorPath)')">$(SolutionDir)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Processor\net8.0-windows10.0.22000.0\win\Microsoft.Management.Configuration.Processor.winmd</MicrosoftManagementConfigurationProcessorPath> </PropertyGroup> <Message Importance="high" Text="Microsoft.Management.Configuration.Processor.winmd -> $(MicrosoftManagementConfigurationProcessorPath)" /> <Error Condition="!Exists('$(MicrosoftManagementConfigurationProcessorPath)')" Text="Microsoft.Management.Configuration.Processor.winmd was not found in $(MicrosoftManagementConfigurationProcessorPath)" /> diff --git a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0-windows</TargetFramework> + <TargetFramework>net8.0-windows</TargetFramework> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\AppInstallerCLIE2ETests\</OutDir> <IsPackable>false</IsPackable> <Platforms>x64;x86</Platforms> @@ -11,7 +11,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup> @@ -25,7 +25,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.23" /> + <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Microsoft.Msix.Utils" Version="2.1.1" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> @@ -38,11 +38,6 @@ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> <PackageReference Include="System.Data.SqlClient" Version="4.8.6" /> - <PackageReference Include="System.Formats.Asn1" Version="6.0.1" /> - <PackageReference Include="System.IO.Packaging" Version="6.0.1" /> - <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" /> - <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.8" /> - <PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" /> <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" /> </ItemGroup> diff --git a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj @@ -217,17 +217,14 @@ copy "$(TargetDir)\resources.pri" "$(TargetDir)\AppInstallerCLI\resources.pri" </PostBuildEvent> </PropertyGroup> - <PropertyGroup Condition="'$(Platform)'=='ARM'"> - <ConfigServerRid>win10-arm</ConfigServerRid> - </PropertyGroup> <PropertyGroup Condition="'$(Platform)'=='ARM64'"> - <ConfigServerRid>win10-arm64</ConfigServerRid> + <ConfigServerRid>win-arm64</ConfigServerRid> </PropertyGroup> <PropertyGroup Condition="'$(Platform)'=='x64'"> - <ConfigServerRid>win10-x64</ConfigServerRid> + <ConfigServerRid>win-x64</ConfigServerRid> </PropertyGroup> <PropertyGroup Condition="'$(Platform)'=='x86'"> - <ConfigServerRid>win10-x86</ConfigServerRid> + <ConfigServerRid>win-x86</ConfigServerRid> </PropertyGroup> <Target Name="WinGetIncludeAdditionalFilesInPackage" AfterTargets="_ComputeAppxPackagePayload"> <PropertyGroup> @@ -253,7 +250,7 @@ <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\AnyCPU\$(Configuration)\Microsoft.Management.Configuration.Projection\**\Microsoft.Management.Configuration.Projection.dll"> <PackagePath>ConfigurationRemotingServer\Microsoft.Management.Configuration.Projection.dll</PackagePath> </WinGetAdditionalPackageFile> - <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\ConfigurationRemotingServer\net6.0-windows10.0.22000.0\$(ConfigServerRid)\**\*"> + <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\ConfigurationRemotingServer\net8.0-windows10.0.22000.0\$(ConfigServerRid)\**\*"> <PackagePath>ConfigurationRemotingServer</PackagePath> <Recurse>true</Recurse> </WinGetAdditionalPackageFile> diff --git a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj @@ -2,34 +2,30 @@ <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework> + <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework> <ImplicitUsings>enable</ImplicitUsings> <Nullable>enable</Nullable> <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion> - <Platforms>x64;x86;arm;arm64</Platforms> + <Platforms>x64;x86;arm64</Platforms> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath> <SelfContained>true</SelfContained> - <RuntimeIdentifiers>win10-x64;win10-x86;win10-arm;win10-arm64</RuntimeIdentifiers> + <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers> <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'x64' "> - <RuntimeIdentifier>win10-x64</RuntimeIdentifier> + <RuntimeIdentifier>win-x64</RuntimeIdentifier> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'x86' "> - <RuntimeIdentifier>win10-x86</RuntimeIdentifier> - </PropertyGroup> - - <PropertyGroup Condition=" '$(Platform)' == 'arm' "> - <RuntimeIdentifier>win10-arm</RuntimeIdentifier> + <RuntimeIdentifier>win-x86</RuntimeIdentifier> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'arm64' "> - <RuntimeIdentifier>win10-arm64</RuntimeIdentifier> + <RuntimeIdentifier>win-arm64</RuntimeIdentifier> </PropertyGroup> <ItemGroup> diff --git a/src/IndexCreationTool/IndexCreationTool.csproj b/src/IndexCreationTool/IndexCreationTool.csproj @@ -1,8 +1,8 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net8.0</TargetFramework> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\IndexCreationTool\</OutDir> <Platforms>x64;x86</Platforms> </PropertyGroup> diff --git a/src/LocalhostWebServer/LocalhostWebServer.csproj b/src/LocalhostWebServer/LocalhostWebServer.csproj @@ -1,7 +1,7 @@ -<Project Sdk="Microsoft.NET.Sdk.Web"> +<Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net8.0</TargetFramework> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\LocalhostWebServer\</OutDir> <Platforms>x64;x86</Platforms> </PropertyGroup> diff --git 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 @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <DotNetVersion>net6.0</DotNetVersion> + <DotNetVersion>net8.0</DotNetVersion> <!-- Keep in sync with attributes in AssemblyInfo.cs --> <TargetFramework>$(DotNetVersion)-windows10.0.22000.0</TargetFramework> <Nullable>enable</Nullable> @@ -21,7 +21,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> @@ -43,18 +43,13 @@ <ItemGroup> <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" /> - <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.8" GeneratePathProperty="true"> + <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" GeneratePathProperty="true"> <ExcludeAssets>contentFiles</ExcludeAssets> </PackageReference> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118"> <PrivateAssets>all</PrivateAssets> </PackageReference> <PackageReference Include="System.Data.SqlClient" Version="4.8.6" /> - <PackageReference Include="System.IO.Packaging" Version="6.0.1" /> - <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.3" /> - <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" /> - <PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" /> - <PackageReference Include="System.Formats.Asn1" Version="6.0.1" /> </ItemGroup> <ItemGroup> diff --git 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework> + <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework> <Platform>AnyCpu</Platform> <ImplicitUsings>enable</ImplicitUsings> <Nullable>enable</Nullable> @@ -11,7 +11,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup> diff --git a/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs b/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs @@ -31,7 +31,7 @@ namespace Microsoft.Management.Configuration.UnitTests.Helpers // 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 "<location of your repo>\src\x64\Debug\Microsoft.Management.Configuration.UnitTests\net6.0-windows10.0.22000.0\Microsoft.Management.Configuration.UnitTests.dll" --TestCaseFilter:Category=OutOfProc + // .\vstest.console.exe "<location of your repo>\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 @@ -1,16 +1,16 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework> + <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework> <Nullable>enable</Nullable> <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion> <Platforms>x64;x86;arm64</Platforms> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath> - <RuntimeIdentifiers>win10-x64;win10-x86;win10-arm;win10-arm64</RuntimeIdentifiers> + <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers> <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> @@ -25,6 +25,9 @@ <ItemGroup> <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" /> + <PackageReference Include="System.Net.Http" Version="4.3.4" /> + <PackageReference Include="System.Private.Uri" Version="4.3.2" /> + <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" /> <PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> @@ -39,7 +42,7 @@ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> <PackageReference Include="Moq" Version="4.18.2" /> - <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.18" GeneratePathProperty="true" /> + <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" GeneratePathProperty="true" /> </ItemGroup> <ItemGroup> diff --git a/src/Microsoft.Management.Configuration.UnitTests/Tests/OpenConfigurationSetTests.cs b/src/Microsoft.Management.Configuration.UnitTests/Tests/OpenConfigurationSetTests.cs @@ -607,7 +607,7 @@ resources: Assert.Equal(2, set.Units.Count); this.VerifyValueSet(set.Metadata, new KeyValuePair<string, object>("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 @@ resources: 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)); } /// <summary> diff --git 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0-windows</TargetFramework> + <TargetFramework>net8.0-windows</TargetFramework> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\Microsoft.Management.Deployment.Projection\</OutDir> <IsPackable>false</IsPackable> <Platforms>x64;x86;arm64</Platforms> @@ -10,7 +10,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <ItemGroup> 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 @@ -3,7 +3,7 @@ <PropertyGroup> <!-- If these target frameworks are updated, make sure to also update the .psd1 and .nuspec files.--> <!-- Keep in sync with attributes in AssemblyInfo.cs --> - <CoreFramework>net6.0-windows10.0.22000.0</CoreFramework> + <CoreFramework>net8.0-windows10.0.22000.0</CoreFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <DesktopFramework>net48</DesktopFramework> <Configurations>Debug;Release;ReleaseStatic</Configurations> @@ -11,7 +11,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup> @@ -52,7 +52,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(TargetFramework)' == '$(CoreFramework)'"> - <RuntimeIdentifier>win10</RuntimeIdentifier> + <RuntimeIdentifier>win</RuntimeIdentifier> </PropertyGroup> <!-- This project doesn't reference it directly, but if I don't add it here it will fail with NETSDK1130 *.winmd cannot be referenced. --> 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 @@ -4,7 +4,7 @@ <!-- If these target frameworks are updated, make sure to also update the .psd1 and .nuspec files.--> <!-- Keep in sync with attributes in AssemblyInfo.cs --> <TargetWindowsVersion>10.0.22000.0</TargetWindowsVersion> - <CoreFramework>net6.0-windows$(TargetWindowsVersion)</CoreFramework> + <CoreFramework>net8.0-windows$(TargetWindowsVersion)</CoreFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <DesktopFramework>net48</DesktopFramework> <Configurations>Debug;Release;ReleaseStatic</Configurations> @@ -12,7 +12,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup> @@ -94,7 +94,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(TargetFramework)' == '$(CoreFramework)'"> - <RuntimeIdentifier>win10</RuntimeIdentifier> + <RuntimeIdentifier>win</RuntimeIdentifier> </PropertyGroup> <PropertyGroup Condition="'$(TargetFramework)' == '$(DesktopFramework)'"> diff --git 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 @@ -2,7 +2,7 @@ <PropertyGroup> <!-- Keep in sync with attributes in AssemblyInfo.cs --> - <TargetFramework>net6.0-windows10.0.22000</TargetFramework> + <TargetFramework>net8.0-windows10.0.22000</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath> <GenerateDocumentationFile>true</GenerateDocumentationFile> @@ -15,7 +15,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> 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 @@ -2,7 +2,7 @@ <PropertyGroup> <!-- Keep in sync with attributes in AssemblyInfo.cs --> - <TargetFramework>net6.0-windows10.0.22000</TargetFramework> + <TargetFramework>net8.0-windows10.0.22000</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <Nullable>enable</Nullable> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath> @@ -14,7 +14,7 @@ <!-- !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!! --> - <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion> + <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> diff --git 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 @@ -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 @@ -1,7 +1,7 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net8.0</TargetFramework> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\WinGetSourceCreator\</OutDir> <ImplicitUsings>enable</ImplicitUsings> <Nullable>enable</Nullable> @@ -9,6 +9,8 @@ <ItemGroup> <PackageReference Include="Microsoft.Msix.Utils" Version="2.1.1" /> + <PackageReference Include="System.Net.Http" Version="4.3.4" /> + <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" /> </ItemGroup> <ItemGroup> diff --git a/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj b/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net8.0</TargetFramework> <Platforms>x64;x86</Platforms> </PropertyGroup> @@ -12,6 +12,8 @@ <PackageReference Include="Microsoft.Msix.Utils" Version="2.1.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" /> <PackageReference Include="Moq" Version="4.18.2" /> + <PackageReference Include="System.Net.Http" Version="4.3.4" /> + <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" /> <PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" /> <PackageReference Include="coverlet.collector" Version="1.2.0" />