diff --git a/NuGet.config b/NuGet.config index 9ee0fa704..064b33cd4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -37,11 +42,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 3ebd698e0..b8c1e4f86 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,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 733440663a189f4c4de64f53bab82fd9382b9a3a + 2410d6496db6fd9153ffac85eedfd80f57390999 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 733440663a189f4c4de64f53bab82fd9382b9a3a + 2410d6496db6fd9153ffac85eedfd80f57390999 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 733440663a189f4c4de64f53bab82fd9382b9a3a + 2410d6496db6fd9153ffac85eedfd80f57390999 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17ea4a71a1adac805a17c272977139ddc6200bf9 + 7fffe6d57cecdb3a726b915334d1add560bd6134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17ea4a71a1adac805a17c272977139ddc6200bf9 + 7fffe6d57cecdb3a726b915334d1add560bd6134 - + 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 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3f6c45a2580cd9387b643163de8136a9691764c8 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index ae00b05f3..2cb335e03 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.108 + 6.0.109 @@ -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.108-servicing.22368.19 - 6.0.108-servicing.22368.19 + 6.0.109-servicing.22421.3 + 6.0.109-servicing.22421.3 $(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.108 + 6.0.109 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.4 + 6.0.9 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b67a1e22a..f98379cb9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -673,11 +673,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 @@ + +