diff --git a/.azure/pipelines/site-extensions.yml b/.azure/pipelines/site-extensions.yml index 69924ca3c1..84a4b2f0d8 100644 --- a/.azure/pipelines/site-extensions.yml +++ b/.azure/pipelines/site-extensions.yml @@ -3,6 +3,8 @@ trigger: include: - release/2.2 +name: $(Date:yyMMdd)-$(Rev:rr) + phases: - phase: SiteExtensions variables: diff --git a/.gitmodules b/.gitmodules index b7960c6e04..d7193f7714 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,10 +26,6 @@ path = modules/Caching url = https://github.com/aspnet/Caching.git branch = master -[submodule "modules/Common"] - path = modules/Common - url = https://github.com/aspnet/Common.git - branch = master [submodule "modules/Configuration"] path = modules/Configuration url = https://github.com/aspnet/Configuration.git diff --git a/build/artifacts.props b/build/artifacts.props index 1265fb285a..199f495d1f 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -25,12 +25,10 @@ - - @@ -55,9 +53,7 @@ - - @@ -172,8 +168,6 @@ - - @@ -188,7 +182,7 @@ - + @@ -212,8 +206,6 @@ - - @@ -226,7 +218,6 @@ - @@ -239,7 +230,6 @@ - @@ -259,23 +249,10 @@ - - - - - - - - - - - - - diff --git a/build/buildorder.props b/build/buildorder.props index df385e5423..cf42ce1e23 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 3c6b50ea06..943e972bb6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + 4.6.0-preview1-26907-04 @@ -30,6 +30,29 @@ 4.10.0-preview1-26907-04 4.6.0-preview1-26907-04 4.6.0-preview1-26829-04 + + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 + 3.0.0-alpha1-10657 @@ -96,7 +119,7 @@ 1.1.9 2.0.9 2.1.3 - 2.2.0-preview3-27014-02 + 2.2.0-rtm-27023-02 $(MicrosoftNETCoreApp21PackageVersion) $(MicrosoftNETCoreApp22PackageVersion) 1.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index a980476968..8f71ea3ac8 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -10,9 +10,49 @@ false + + + + + + + false + + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/submodules.props b/build/submodules.props index baba5554fb..ec1447f04a 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/modules/Common b/modules/Common deleted file mode 160000 index a527cc2912..0000000000 --- a/modules/Common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a527cc291264a21f32569a3e57934d294829fa20