diff --git a/NuGet.config b/NuGet.config index 277341705f87..3ee97fb0c08f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -26,10 +26,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc717790d4a8..b07f58206db4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 121c96f445deb1ae6f7c66bb542bf0fd75c37c48 + 136f129ddca49729a24f0e65465fc638bd584c70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 https://github.com/dotnet/source-build-externals @@ -262,33 +262,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 19f489b8b49b0ffacdffaed17801a6bcb3375c7a + 0fb6ac59fb1edbe4ed3ad62661df0eb7eacd7903 https://github.com/dotnet/xdt @@ -302,22 +302,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8587d13a2764c025277d628471984bae8e16427c - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 diff --git a/eng/Versions.props b/eng/Versions.props index 69afd5c95387..b7a36318923a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,8 +8,8 @@ 7 0 - 19 - true + 20 + false @@ -63,12 +63,12 @@ 7.0.0 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19-servicing.24215.23 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20-servicing.24267.16 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.19-servicing.24215.23 + 7.0.20-servicing.24267.16 7.0.0 7.0.2 7.0.0 @@ -125,17 +125,17 @@ 7.0.4 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 - 7.0.19 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 + 7.0.20 - 7.0.0-beta.24209.2 - 7.0.0-beta.24209.2 + 7.0.0-beta.24266.2 + 7.0.0-beta.24266.2 7.0.0-alpha.1.24210.1 diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 6661fed566e4..858a0b237c62 100644 Binary files a/eng/common/loc/P22DotNetHtmlLocalization.lss and b/eng/common/loc/P22DotNetHtmlLocalization.lss differ diff --git a/global.json b/global.json index 3a07f13ec01f..3d55cceca8b5 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24266.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24266.2" } }