diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d20e0d52e54c..1f7c4dac9b80 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,20 +2,20 @@
# See https://help.github.com/articles/about-code-owners/
/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
-/global.json @dotnet/aspnet-build @dougbu @wtgodbe
-/.azure/ @dotnet/aspnet-build @dougbu @wtgodbe
-/.azuredevops/ @dotnet/aspnet-build @dougbu @wtgodbe
-/.config/ @dotnet/aspnet-build @dougbu @wtgodbe
-/.devcontainer/ @captainsafia @TanayParikh
-/.vscode/ @captainsafia @TanayParikh
-/.github/ @dotnet/aspnet-build @dougbu @wtgodbe
-/.github/*_TEMPLATE/ @dotnet/aspnet-build @dougbu @wtgodbe @mkArtakMSFT
-/.github/workflows/ @dotnet/aspnet-build @dougbu @wtgodbe @tratcher
+/global.json @dotnet/aspnet-build @wtgodbe
+/.azure/ @dotnet/aspnet-build @wtgodbe
+/.azuredevops/ @dotnet/aspnet-build @wtgodbe
+/.config/ @dotnet/aspnet-build @wtgodbe
+/.devcontainer/ @captainsafia
+/.vscode/ @captainsafia
+/.github/ @dotnet/aspnet-build @wtgodbe
+/.github/*_TEMPLATE/ @dotnet/aspnet-build @wtgodbe @mkArtakMSFT
+/.github/workflows/ @dotnet/aspnet-build @wtgodbe @tratcher
/docs/ @captainsafia @mkArtakMSFT
-/eng/ @dotnet/aspnet-build @dougbu @wtgodbe
+/eng/ @dotnet/aspnet-build @wtgodbe
/eng/common/ @dotnet-maestro-bot
-/eng/Versions.props @dotnet-maestro-bot @dotnet/aspnet-build @dougbu @wtgodbe
-/eng/Version.Details.xml @dotnet-maestro-bot @dotnet/aspnet-build @dougbu @wtgodbe
+/eng/Versions.props @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
+/eng/Version.Details.xml @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
/src/Caching/ @captainsafia @halter73
/src/Caching/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73
/src/Components/ @dotnet/aspnet-blazor-eng
@@ -49,4 +49,4 @@
/src/Shared/test/Shared.Tests/runtime/ @dotnet/http
/src/SignalR/ @BrennanConroy @halter73
/src/SignalR/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy @halter73
-/src/submodules @dotnet/aspnet-build @dougbu @wtgodbe
+/src/submodules @dotnet/aspnet-build @wtgodbe
diff --git a/NuGet.config b/NuGet.config
index 667e4d6824e8..42c549c5f675 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,12 +4,10 @@
-
-
+
-
-
+
@@ -28,12 +26,10 @@
-
-
+
-
-
+
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index ec629dd0f009..9d5c3a5fb229 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,138 +2,138 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
-
-
+
+
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
@@ -141,263 +141,263 @@
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
-
-
+
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
-
+
+
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
-
-
-
+
+
+
- 7.0.0
+ 7.0.4
-
-
-
+
+
+
- 7.0.0
+ 7.0.4
-
-
+
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
-
-
+
+
+
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
-
+
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
@@ -406,15 +406,15 @@
- 0.3.0
+ 0.3.3
-
+
- 7.0.0
+ 7.0.4
@@ -422,71 +422,71 @@
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
-
+
+
-
+
-
-
+
+
- 7.0.0
+ 7.0.4
-
-
+
+
- 7.0.0
+ 7.0.4
-
-
+
+
- 7.0.0
+ 7.0.4
@@ -502,27 +502,27 @@
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
@@ -531,254 +531,254 @@
- 7.0.0
+ 7.0.4
-
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
-
+
+
-
-
+
+
-
-
+
+
- 7.0.0
+ 7.0.4
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- 7.0.0
+ 7.0.4
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
-
-
-
+
+
+
+
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
@@ -794,46 +794,46 @@
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
-
-
+
+
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
@@ -843,7 +843,7 @@
- 7.0.0
+ 7.0.4
@@ -852,73 +852,73 @@
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
@@ -947,35 +947,35 @@
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
-
+
-
+
- 7.0.0
+ 7.0.4
- 7.0.0
+ 7.0.4
-
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index fb5ba67dbbb9..c3f8a4aa0fc7 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -1,112 +1,112 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 266bf65c4d75..593164a0b7bd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,37 +9,37 @@
-->
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 0c8605d87b88157c773efd70ed2b8546ef18d5a1
+ 5c6be2458d7d7d2ec22d1555bf829ed19adacb2a
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -53,9 +53,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -121,9 +121,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -169,17 +169,17 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
https://github.com/dotnet/source-build-externals
@@ -190,9 +190,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -206,25 +206,25 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -242,9 +242,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 97203d38ba734d76d39984c5206f2747f792fa89
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -262,33 +262,33 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d037e070ebe5c83838443f869d5800752b0fcb13
+ 8042d61b17540e49e53569e3728d2faa1c596583
https://github.com/dotnet/xdt
@@ -298,26 +298,26 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 8042d61b17540e49e53569e3728d2faa1c596583
-
+
https://github.com/dotnet/arcade
- f36ea231c234560514ede4c2747897a737ced28f
+ 099bbb071e187ba4e1603004597624e6acae6394
-
+
https://github.com/dotnet/arcade
- f36ea231c234560514ede4c2747897a737ced28f
+ 099bbb071e187ba4e1603004597624e6acae6394
-
+
https://github.com/dotnet/arcade
- f36ea231c234560514ede4c2747897a737ced28f
+ 099bbb071e187ba4e1603004597624e6acae6394
-
+
https://github.com/dotnet/arcade
- f36ea231c234560514ede4c2747897a737ced28f
+ 099bbb071e187ba4e1603004597624e6acae6394
diff --git a/eng/Versions.props b/eng/Versions.props
index de27e45f6090..b08e7b6b5e26 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,8 +8,8 @@
7
0
- 2
- false
+ 5
+ true
@@ -63,16 +63,16 @@
7.0.0
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2-servicing.22606.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5-servicing.23174.5
7.0.0
7.0.0
7.0.0
- 7.0.2
+ 7.0.4
7.0.0
7.0.0
7.0.0
@@ -89,7 +89,7 @@
7.0.0
7.0.0-rtm.22518.5
7.0.0
- 7.0.0
+ 7.0.1
7.0.0
7.0.0
7.0.0
@@ -101,41 +101,41 @@
7.0.0
7.0.0
7.0.0
- 7.0.0
+ 7.0.1
7.0.0
- 7.0.2-servicing.22606.5
+ 7.0.5-servicing.23174.5
7.0.0
- 7.0.0
+ 7.0.2
7.0.0
7.0.0
7.0.0
- 7.0.0
+ 7.0.1
7.0.0
- 7.0.0
+ 7.0.1
7.0.0
- 7.0.0
+ 7.0.1
7.0.1
7.0.0
7.0.0
7.0.0
- 7.0.1
+ 7.0.2
7.0.1
7.0.0
7.0.0
- 7.0.0
+ 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
- 7.0.2
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
+ 7.0.5
- 7.0.0-beta.22561.2
- 7.0.0-beta.22561.2
+ 7.0.0-beta.23164.3
+ 7.0.0-beta.23164.3
7.0.0-alpha.1.22505.1
@@ -232,13 +232,13 @@
2.1.1
2.2.0
- 3.1.31-servicing-22514-9
+ 3.1.32-servicing-22566-10
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)
5.0.17-servicing-22215-7
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)
- 6.0.11-servicing-22523-4
+ 6.0.14-servicing-23074-3
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 561576be97c2..964610524760 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -1,5 +1,12 @@
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
+# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
+unset(LINUX)
+unset(FREEBSD)
+unset(ILLUMOS)
+unset(ANDROID)
+unset(TIZEN)
+
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
set(CMAKE_SYSTEM_NAME FreeBSD)
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index bab18543d6c4..bcb579e37a91 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
+if (-not $wxlFiles) {
+ $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
+ if ($wxlEnFiles) {
+ $wxlFiles = @()
+ $wxlEnFiles | ForEach-Object {
+ $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
+ $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+ }
+ }
+}
+
+$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
+$macosHtmlFiles = @()
+if ($macosHtmlEnFiles) {
+ $macosHtmlEnFiles | ForEach-Object {
+ $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
+ $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+ }
+}
$xlfFiles = @()
@@ -91,6 +110,7 @@ $locJson = @{
)
},
@{
+ LanguageSet = $LanguageSet
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "wxl_loc.lss" )
LocItems = @(
@@ -98,8 +118,7 @@ $locJson = @{
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
- if ($_.FullName.Contains($exclusion))
- {
+ if ($_.FullName.Contains($exclusion)) {
$continue = $false
}
}
@@ -110,7 +129,30 @@ $locJson = @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
- Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
+ }
+ }
+ }
+ )
+ },
+ @{
+ LanguageSet = $LanguageSet
+ CloneLanguageSet = "VS_macOS_CloneLanguages"
+ LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
+ LocItems = @(
+ $macosHtmlFiles | ForEach-Object {
+ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
+ $continue = $true
+ foreach ($exclusion in $exclusions.Exclusions) {
+ if ($_.FullName.Contains($exclusion)) {
+ $continue = $false
+ }
+ }
+ $sourceFile = ($_.FullName | Resolve-Path -Relative)
+ if ($continue) {
+ return @{
+ SourceFile = $sourceFile
+ CopyOption = "LangIDOnPath"
+ OutputPath = $outputPath
}
}
}
diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss
new file mode 100644
index 000000000000..6661fed566e4
Binary files /dev/null and b/eng/common/loc/P22DotNetHtmlLocalization.lss differ
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 39be08d4b16c..e10a59687974 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
- $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index aaeb83b4dcbd..7c164ac02f4d 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -46,6 +46,7 @@ jobs:
- template: /eng/common/templates/variables/sdl-variables.yml
- name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
+ - template: /eng/common/templates/variables/pool-providers.yml
pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -53,7 +54,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- checkout: self
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 6b8fc9970808..60ab00c4de3a 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -14,6 +14,7 @@ parameters:
ReusePr: true
UseLfLineEndings: true
UseCheckedInLocProjectJson: false
+ SkipLocProjectJsonGeneration: false
LanguageSet: VS_Main_Languages
LclSource: lclFilesInRepo
LclPackageId: ''
@@ -22,13 +23,25 @@ parameters:
MirrorRepo: ''
MirrorBranch: main
condition: ''
+ JobNameSuffix: ''
jobs:
-- job: OneLocBuild
+- job: OneLocBuild${{ parameters.JobNameSuffix }}
dependsOn: ${{ parameters.dependsOn }}
- displayName: OneLocBuild
+ displayName: OneLocBuild${{ parameters.JobNameSuffix }}
+
+ variables:
+ - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
+ - name: _GenerateLocProjectArguments
+ value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
+ -LanguageSet "${{ parameters.LanguageSet }}"
+ -CreateNeutralXlfs
+ - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
+ - name: _GenerateLocProjectArguments
+ value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
+ - template: /eng/common/templates/variables/pool-providers.yml
${{ if ne(parameters.pool, '') }}:
pool: ${{ parameters.pool }}
@@ -40,27 +53,17 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
- variables:
- - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
- - name: _GenerateLocProjectArguments
- value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
- -LanguageSet "${{ parameters.LanguageSet }}"
- -CreateNeutralXlfs
- - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
- - name: _GenerateLocProjectArguments
- value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
-
-
steps:
- - task: Powershell@2
- inputs:
- filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
- arguments: $(_GenerateLocProjectArguments)
- displayName: Generate LocProject.json
- condition: ${{ parameters.condition }}
+ - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
+ - task: Powershell@2
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+ arguments: $(_GenerateLocProjectArguments)
+ displayName: Generate LocProject.json
+ condition: ${{ parameters.condition }}
- task: OneLocBuild@2
displayName: OneLocBuild
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index 1cbb6a0c5600..c5fedd7f70ce 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish
dependsOn: ${{ parameters.dependsOn }}
+ timeoutInMinutes: 150
${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
displayName: Publish Assets
${{ else }}:
displayName: Publish to Build Asset Registry
- pool: ${{ parameters.pool }}
-
variables:
+ - template: /eng/common/templates/variables/pool-providers.yml
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: Publish-Build-Assets
- group: AzureDevOps-Artifact-Feeds-Pats
@@ -51,6 +51,16 @@ jobs:
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
- template: /eng/common/templates/post-build/common-variables.yml
+ pool:
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: $(DncEngInternalBuildPool)
+ demands: ImageOverride -equals windows.vs2019.amd64
+
steps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: DownloadBuildArtifacts@0
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index b6137f44ada1..8a3deef2b727 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -44,13 +44,16 @@ jobs:
${{ if eq(parameters.platform.pool, '') }}:
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
# source-build builds run in Docker, including the default managed platform.
+ # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore-Svc-Public
+ name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 59a42c338ab1..09c506d11855 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -22,16 +22,17 @@ jobs:
value: ${{ parameters.binlogPath }}
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: source-dot-net stage1 variables
+ - template: /eng/common/templates/variables/pool-providers.yml
${{ if ne(parameters.pool, '') }}:
pool: ${{ parameters.pool }}
${{ if eq(parameters.pool, '') }}:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore-Svc-Public
+ name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 297e7946b0be..289bb2396ce8 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -88,15 +88,6 @@ jobs:
- ${{ job.job }}
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
- pool:
- # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
- name: VSEngSS-MicroBuild2022-1ES
- demands: Cmd
- # If it's not devdiv, it's dnceng
- ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Svc-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 957375c1c1a6..c051f1b65e9c 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -95,6 +95,7 @@ stages:
displayName: Validate Build Assets
variables:
- template: common-variables.yml
+ - template: /eng/common/templates/variables/pool-providers.yml
jobs:
- job:
displayName: NuGet Validation
@@ -106,7 +107,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ else }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
@@ -143,7 +144,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ else }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
@@ -203,7 +204,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ else }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
@@ -251,6 +252,7 @@ stages:
displayName: Publish using Darc
variables:
- template: common-variables.yml
+ - template: /eng/common/templates/variables/pool-providers.yml
jobs:
- job:
displayName: Publish Using Darc
@@ -262,7 +264,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ else }}:
- name: NetCore1ESPool-Svc-Internal
+ name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
@@ -282,4 +284,4 @@ stages:
-MaestroToken '$(MaestroApiAccessToken)'
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
- -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
+ -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 12a8ff94d8e9..4624885e3bfe 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,6 +63,11 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
+ runtimeOsArgs=
+ if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
+ runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
+ fi
+
publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
+ $runtimeOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build
diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml
new file mode 100644
index 000000000000..99c80212bac1
--- /dev/null
+++ b/eng/common/templates/variables/pool-providers.yml
@@ -0,0 +1,57 @@
+# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
+# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
+
+# Motivation:
+# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
+# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
+# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS)
+# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
+# team needs to move resources around and create new and potentially differently-named pools. Using this template
+# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
+
+# How to use:
+# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
+# If we find alternate naming conventions in broad usage these can be added to the condition below.
+#
+# First, import the template in an arcade-ified repo to pick up the variables, e.g.:
+#
+# variables:
+# - template: /eng/common/templates/variables/pool-providers.yml
+#
+# ... then anywhere specifying the pool provider use the runtime variables,
+# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.:
+#
+# pool:
+# name: $(DncEngInternalBuildPool)
+# demands: ImageOverride -equals windows.vs2019.amd64
+
+variables:
+ # Coalesce the target and source branches so we know when a PR targets a release branch
+ # If these variables are somehow missing, fall back to main (tends to have more capacity)
+
+ # Any new -Svc alternative pools should have variables added here to allow for splitting work
+ - name: DncEngPublicBuildPool
+ value: $[
+ replace(
+ replace(
+ eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
+ True,
+ 'NetCore-Svc-Public'
+ ),
+ False,
+ 'NetCore-Public'
+ )
+ ]
+
+ - name: DncEngInternalBuildPool
+ value: $[
+ replace(
+ replace(
+ eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
+ True,
+ 'NetCore1ESPool-Svc-Internal'
+ ),
+ False,
+ 'NetCore1ESPool-Internal'
+ )
+ ]
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 449126943299..021555cf3381 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
- # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
- $defaultXCopyMSBuildVersion = '17.3.1'
+ # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
+ $defaultXCopyMSBuildVersion = '17.4.1'
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index c110d0ed410c..e9a7ed9af679 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json"
# determine if global.json contains a "runtimes" entry
global_json_has_runtimes=false
if command -v jq &> /dev/null; then
- if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then
+ if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then
global_json_has_runtimes=true
fi
elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then
diff --git a/eng/scripts/mark-shipped.ps1 b/eng/scripts/mark-shipped.ps1
index df59843fba65..99ac8ca19eb0 100644
--- a/eng/scripts/mark-shipped.ps1
+++ b/eng/scripts/mark-shipped.ps1
@@ -6,10 +6,8 @@ $ErrorActionPreference = "Stop"
function MarkShipped([string]$dir) {
$shippedFilePath = Join-Path $dir "PublicAPI.Shipped.txt"
- $shipped = Get-Content $shippedFilePath
- if ($null -eq $shipped) {
- $shipped = @()
- }
+ $shipped = @()
+ $shipped += Get-Content $shippedFilePath
$unshippedFilePath = Join-Path $dir "PublicAPI.Unshipped.txt"
$unshipped = Get-Content $unshippedFilePath
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index 46e965c10a2f..b2aa47f9fdca 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -28,7 +28,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/global.json b/global.json
index 0dde90033d58..228f7b5051d1 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "7.0.100"
+ "version": "7.0.104"
},
"tools": {
- "dotnet": "7.0.100",
+ "dotnet": "7.0.104",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.22.10",
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3"
}
}
diff --git a/src/Caching/SqlServer/src/PublicAPI.Shipped.txt b/src/Caching/SqlServer/src/PublicAPI.Shipped.txt
index ac8ebd7ff823..2e1207cc32ad 100644
--- a/src/Caching/SqlServer/src/PublicAPI.Shipped.txt
+++ b/src/Caching/SqlServer/src/PublicAPI.Shipped.txt
@@ -1,4 +1,5 @@
#nullable enable
+Microsoft.Extensions.Caching.SqlServer.SqlServerCache
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.Get(string! key) -> byte[]?
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.GetAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.Refresh(string! key) -> void
@@ -8,20 +9,19 @@ Microsoft.Extensions.Caching.SqlServer.SqlServerCache.RemoveAsync(string! key, S
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.Set(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options) -> void
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.SetAsync(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.SqlServerCache(Microsoft.Extensions.Options.IOptions! options) -> void
+Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ConnectionString.get -> string?
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ConnectionString.set -> void
+Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.get -> System.TimeSpan
+Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.set -> void
+Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.get -> System.TimeSpan?
+Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.set -> void
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SchemaName.get -> string?
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SchemaName.set -> void
+Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SqlServerCacheOptions() -> void
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SystemClock.get -> Microsoft.Extensions.Internal.ISystemClock!
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SystemClock.set -> void
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.TableName.get -> string?
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.TableName.set -> void
-static Microsoft.Extensions.DependencyInjection.SqlServerCachingServicesExtensions.AddDistributedSqlServerCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-Microsoft.Extensions.Caching.SqlServer.SqlServerCache
-Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions
-Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.get -> System.TimeSpan
-Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.set -> void
-Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.get -> System.TimeSpan?
-Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.set -> void
-Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SqlServerCacheOptions() -> void
Microsoft.Extensions.DependencyInjection.SqlServerCachingServicesExtensions
+static Microsoft.Extensions.DependencyInjection.SqlServerCachingServicesExtensions.AddDistributedSqlServerCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI.Shipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI.Shipped.txt
index ede022b36341..bb997fdc8643 100644
--- a/src/Caching/StackExchangeRedis/src/PublicAPI.Shipped.txt
+++ b/src/Caching/StackExchangeRedis/src/PublicAPI.Shipped.txt
@@ -1,4 +1,6 @@
#nullable enable
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Dispose() -> void
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Get(string! key) -> byte[]?
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.GetAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RedisCache(Microsoft.Extensions.Options.IOptions! optionsAccessor) -> void
@@ -8,6 +10,7 @@ Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Remove(string! key) -
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RemoveAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Set(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options) -> void
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.SetAsync(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.get -> string?
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.set -> void
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConfigurationOptions.get -> StackExchange.Redis.ConfigurationOptions?
@@ -18,9 +21,6 @@ Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.g
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.set -> void
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.get -> System.Func?
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.set -> void
-static Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions.AddStackExchangeRedisCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Dispose() -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.RedisCacheOptions() -> void
Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions
+static Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions.AddStackExchangeRedisCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Components/Components/src/PublicAPI.Shipped.txt b/src/Components/Components/src/PublicAPI.Shipped.txt
index 874d6125b229..859bce795398 100644
--- a/src/Components/Components/src/PublicAPI.Shipped.txt
+++ b/src/Components/Components/src/PublicAPI.Shipped.txt
@@ -74,8 +74,8 @@ Microsoft.AspNetCore.Components.DynamicComponent.Type.set -> void
Microsoft.AspNetCore.Components.EditorRequiredAttribute
Microsoft.AspNetCore.Components.EditorRequiredAttribute.EditorRequiredAttribute() -> void
Microsoft.AspNetCore.Components.ElementReference
-Microsoft.AspNetCore.Components.ElementReference.ElementReference() -> void
Microsoft.AspNetCore.Components.ElementReference.Context.get -> Microsoft.AspNetCore.Components.ElementReferenceContext?
+Microsoft.AspNetCore.Components.ElementReference.ElementReference() -> void
Microsoft.AspNetCore.Components.ElementReference.ElementReference(string! id) -> void
Microsoft.AspNetCore.Components.ElementReference.ElementReference(string! id, Microsoft.AspNetCore.Components.ElementReferenceContext? context) -> void
Microsoft.AspNetCore.Components.ElementReference.Id.get -> string!
@@ -177,6 +177,8 @@ Microsoft.AspNetCore.Components.NavigationException.NavigationException(string!
Microsoft.AspNetCore.Components.NavigationManager
Microsoft.AspNetCore.Components.NavigationManager.BaseUri.get -> string!
Microsoft.AspNetCore.Components.NavigationManager.BaseUri.set -> void
+Microsoft.AspNetCore.Components.NavigationManager.HistoryEntryState.get -> string?
+Microsoft.AspNetCore.Components.NavigationManager.HistoryEntryState.set -> void
Microsoft.AspNetCore.Components.NavigationManager.Initialize(string! baseUri, string! uri) -> void
Microsoft.AspNetCore.Components.NavigationManager.LocationChanged -> System.EventHandler!
Microsoft.AspNetCore.Components.NavigationManager.NavigateTo(string! uri, bool forceLoad = false, bool replace = false) -> void
@@ -184,6 +186,8 @@ Microsoft.AspNetCore.Components.NavigationManager.NavigateTo(string! uri, bool f
Microsoft.AspNetCore.Components.NavigationManager.NavigateTo(string! uri, Microsoft.AspNetCore.Components.NavigationOptions options) -> void
Microsoft.AspNetCore.Components.NavigationManager.NavigationManager() -> void
Microsoft.AspNetCore.Components.NavigationManager.NotifyLocationChanged(bool isInterceptedLink) -> void
+Microsoft.AspNetCore.Components.NavigationManager.NotifyLocationChangingAsync(string! uri, string? state, bool isNavigationIntercepted) -> System.Threading.Tasks.ValueTask
+Microsoft.AspNetCore.Components.NavigationManager.RegisterLocationChangingHandler(System.Func! locationChangingHandler) -> System.IDisposable!
Microsoft.AspNetCore.Components.NavigationManager.ToAbsoluteUri(string! relativeUri) -> System.Uri!
Microsoft.AspNetCore.Components.NavigationManager.ToBaseRelativePath(string! uri) -> string!
Microsoft.AspNetCore.Components.NavigationManager.Uri.get -> string!
@@ -192,6 +196,8 @@ Microsoft.AspNetCore.Components.NavigationManagerExtensions
Microsoft.AspNetCore.Components.NavigationOptions
Microsoft.AspNetCore.Components.NavigationOptions.ForceLoad.get -> bool
Microsoft.AspNetCore.Components.NavigationOptions.ForceLoad.init -> void
+Microsoft.AspNetCore.Components.NavigationOptions.HistoryEntryState.get -> string?
+Microsoft.AspNetCore.Components.NavigationOptions.HistoryEntryState.init -> void
Microsoft.AspNetCore.Components.NavigationOptions.NavigationOptions() -> void
Microsoft.AspNetCore.Components.NavigationOptions.ReplaceHistoryEntry.get -> bool
Microsoft.AspNetCore.Components.NavigationOptions.ReplaceHistoryEntry.init -> void
@@ -207,19 +213,19 @@ Microsoft.AspNetCore.Components.ParameterAttribute.CaptureUnmatchedValues.get ->
Microsoft.AspNetCore.Components.ParameterAttribute.CaptureUnmatchedValues.set -> void
Microsoft.AspNetCore.Components.ParameterAttribute.ParameterAttribute() -> void
Microsoft.AspNetCore.Components.ParameterValue
-Microsoft.AspNetCore.Components.ParameterValue.ParameterValue() -> void
Microsoft.AspNetCore.Components.ParameterValue.Cascading.get -> bool
Microsoft.AspNetCore.Components.ParameterValue.Name.get -> string!
+Microsoft.AspNetCore.Components.ParameterValue.ParameterValue() -> void
Microsoft.AspNetCore.Components.ParameterValue.Value.get -> object!
Microsoft.AspNetCore.Components.ParameterView
Microsoft.AspNetCore.Components.ParameterView.Enumerator
-Microsoft.AspNetCore.Components.ParameterView.Enumerator.Enumerator() -> void
-Microsoft.AspNetCore.Components.ParameterView.ParameterView() -> void
Microsoft.AspNetCore.Components.ParameterView.Enumerator.Current.get -> Microsoft.AspNetCore.Components.ParameterValue
+Microsoft.AspNetCore.Components.ParameterView.Enumerator.Enumerator() -> void
Microsoft.AspNetCore.Components.ParameterView.Enumerator.MoveNext() -> bool
Microsoft.AspNetCore.Components.ParameterView.GetEnumerator() -> Microsoft.AspNetCore.Components.ParameterView.Enumerator
Microsoft.AspNetCore.Components.ParameterView.GetValueOrDefault(string! parameterName) -> TValue?
Microsoft.AspNetCore.Components.ParameterView.GetValueOrDefault(string! parameterName, TValue defaultValue) -> TValue
+Microsoft.AspNetCore.Components.ParameterView.ParameterView() -> void
Microsoft.AspNetCore.Components.ParameterView.SetParameterProperties(object! target) -> void
Microsoft.AspNetCore.Components.ParameterView.ToDictionary() -> System.Collections.Generic.IReadOnlyDictionary!
Microsoft.AspNetCore.Components.ParameterView.TryGetValue(string! parameterName, out TValue result) -> bool
@@ -228,16 +234,16 @@ Microsoft.AspNetCore.Components.PersistentComponentState.PersistAsJson(s
Microsoft.AspNetCore.Components.PersistentComponentState.RegisterOnPersisting(System.Func! callback) -> Microsoft.AspNetCore.Components.PersistingComponentStateSubscription
Microsoft.AspNetCore.Components.PersistentComponentState.TryTakeFromJson(string! key, out TValue? instance) -> bool
Microsoft.AspNetCore.Components.PersistingComponentStateSubscription
-Microsoft.AspNetCore.Components.PersistingComponentStateSubscription.PersistingComponentStateSubscription() -> void
Microsoft.AspNetCore.Components.PersistingComponentStateSubscription.Dispose() -> void
+Microsoft.AspNetCore.Components.PersistingComponentStateSubscription.PersistingComponentStateSubscription() -> void
Microsoft.AspNetCore.Components.RenderFragment
Microsoft.AspNetCore.Components.RenderFragment
Microsoft.AspNetCore.Components.RenderHandle
-Microsoft.AspNetCore.Components.RenderHandle.RenderHandle() -> void
Microsoft.AspNetCore.Components.RenderHandle.Dispatcher.get -> Microsoft.AspNetCore.Components.Dispatcher!
Microsoft.AspNetCore.Components.RenderHandle.IsInitialized.get -> bool
Microsoft.AspNetCore.Components.RenderHandle.IsRenderingOnMetadataUpdate.get -> bool
Microsoft.AspNetCore.Components.RenderHandle.Render(Microsoft.AspNetCore.Components.RenderFragment! renderFragment) -> void
+Microsoft.AspNetCore.Components.RenderHandle.RenderHandle() -> void
Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder
Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddAttribute(int sequence, Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame frame) -> void
Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddAttribute(int sequence, string! name) -> void
@@ -249,6 +255,7 @@ Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddAttribute(int seq
Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddAttribute(int sequence, string! name, Microsoft.AspNetCore.Components.EventCallback value) -> void
Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddComponentReferenceCapture(int sequence, System.Action