diff --git a/NuGet.config b/NuGet.config index 1f98426d4..1cd04a927 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,21 @@ + - + + + + @@ -36,11 +40,15 @@ + + + + diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817f..7707ace1a 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac9751877..b7e2e834b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://github.com/dotnet/test-templates @@ -90,47 +90,47 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e + 18485c488a5469beb10ad61263885275f2d3b170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e + 18485c488a5469beb10ad61263885275f2d3b170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7a75fd34f53bc300206bd8cfc636527934dd17af + a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + d5218142e9d56ab25bb5d0034a77484be4dd7c17 - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + d5218142e9d56ab25bb5d0034a77484be4dd7c17 - + https://github.com/microsoft/vstest c7ba2ca721808f830482ace6be06ae93077e0e7b @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - dd078d4e43fca042188bafc4548e6fe2abb62250 + 8301d4840fa1a3e822c2cb17fdf7056fa6b41583 - + https://github.com/dotnet/msbuild - 92e0776509a23ed2c1e24bf906a92f045899b885 + 2badb37d109910fbd3155cf8743224b7a27494d8 diff --git a/eng/Versions.props b/eng/Versions.props index 345614c44..ae2b861d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22419.10 - 6.0.8-servicing.22368.7 + 6.0.9-servicing.22420.4 - 6.0.400 + 6.0.401 @@ -44,20 +44,20 @@ - 6.0.8 - 6.0.8 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 0.2.0 - 6.0.400-rtm.22368.21 - 6.0.400-rtm.22368.21 + 6.0.401-servicing.22421.5 + 6.0.401-servicing.22421.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 2.1.0 - 6.0.8-servicing.22368.4 - 6.0.8-servicing.22368.4 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22420.3 + 6.0.9-servicing.22420.3 + 6.0.9 + 6.0.9 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400 + 6.0.401 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-release-20220708-01 + 17.3.0 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e8948ec0b..45d27f020 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -675,11 +675,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d..f9fe2c166 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + +