diff --git a/.gitmodules b/.gitmodules
index f7aa2b3c44..38ea10beb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,10 +26,6 @@
path = modules/HttpAbstractions
url = https://github.com/aspnet/HttpAbstractions.git
branch = master
-[submodule "modules/HttpClientFactory"]
- path = modules/HttpClientFactory
- url = https://github.com/aspnet/HttpClientFactory.git
- branch = master
[submodule "modules/HttpSysServer"]
path = modules/HttpSysServer
url = https://github.com/aspnet/HttpSysServer.git
diff --git a/build/CodeSign.props b/build/CodeSign.props
index 8b3a235030..c312f652d7 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -31,6 +31,7 @@
+
diff --git a/build/Publish.targets b/build/Publish.targets
index 0b9c69a452..1aab9b260d 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -58,7 +58,7 @@
Value="$(PackageVersion)" />
-
+
aspnetcore/Runtime/$(PackageVersion)/
aspnetcore/npm/
diff --git a/build/artifacts.props b/build/artifacts.props
index f185203b58..8321c20669 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -166,8 +166,6 @@
-
-
diff --git a/build/buildorder.props b/build/buildorder.props
index 3badd4a6d1..743da8e3bd 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -9,7 +9,6 @@
-
@@ -33,6 +32,6 @@
-
+
diff --git a/build/dependencies.props b/build/dependencies.props
index 7a2cf789f7..6892e74d89 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -69,6 +69,7 @@
3.0.0-preview-181113-11
3.0.0-preview-181113-11
3.0.0-preview-181113-11
+ 3.0.0-alpha1-10742
3.0.0-preview-181113-11
3.0.0-preview-181113-11
3.0.0-preview-181113-11
@@ -220,8 +221,6 @@
2.0.3
1.0.1
11.0.2
- 2.0.1
- 6.0.1
0.20.0
3.12.1
2.43.0
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index e723c6d7a4..14920a2068 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -45,6 +45,7 @@
+
@@ -204,8 +205,6 @@
-
-
diff --git a/build/submodules.props b/build/submodules.props
index fcabf06165..d2cb4f463a 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -44,7 +44,6 @@
-
@@ -59,7 +58,7 @@
-
+
diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory
deleted file mode 160000
index 7c4f9479b4..0000000000
--- a/modules/HttpClientFactory
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7c4f9479b4753a37c8b0669a883002e5e448cc94
diff --git a/scripts/GenerateTags.ps1 b/scripts/GenerateTags.ps1
index e797f15ad4..bc57cd8cbe 100755
--- a/scripts/GenerateTags.ps1
+++ b/scripts/GenerateTags.ps1
@@ -43,10 +43,10 @@ function New-GitTag {
Invoke-Block { & git tag -m "v$Tag" $Tag HEAD }
Write-Host -f Magenta "${Repo}: added tag '$Tag'"
}
- }
- if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) {
- Invoke-Block { & git push origin refs/tags/$Tag }
+ if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) {
+ Invoke-Block { & git push origin refs/tags/$Tag }
+ }
}
}
finally {
diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props
index 4fcd933beb..0888e183c7 100644
--- a/src/SiteExtensions/build/repo.props
+++ b/src/SiteExtensions/build/repo.props
@@ -3,5 +3,7 @@
true
+ $(RepositoryRoot)eng\signcheck.exclusions.txt
+
diff --git a/src/SiteExtensions/eng/signcheck.exclusions.txt b/src/SiteExtensions/eng/signcheck.exclusions.txt
new file mode 100644
index 0000000000..77d94eceda
--- /dev/null
+++ b/src/SiteExtensions/eng/signcheck.exclusions.txt
@@ -0,0 +1 @@
+content/store/*/apphost.exe;Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.