diff --git a/build/artifacts.props b/build/artifacts.props
index 8f14ee8855..87eec72bc3 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -246,6 +246,7 @@
+
diff --git a/modules/Diagnostics b/modules/Diagnostics
index f1058f0d5d..f0623fff60 160000
--- a/modules/Diagnostics
+++ b/modules/Diagnostics
@@ -1 +1 @@
-Subproject commit f1058f0d5d72aa9dcc4b7ac028cfbb7d93127dea
+Subproject commit f0623fff606a6552669b44ca82c12589326952b3
diff --git a/run.sh b/run.sh
index 1eef4d8194..3c43651bdc 100755
--- a/run.sh
+++ b/run.sh
@@ -248,17 +248,20 @@ if [ -f "$config_file" ]; then
config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
else
- __warn "$config_file is invalid JSON. Its settings will be ignored."
+ __error "$config_file is invalid JSON. Its settings will be ignored."
+ exit 1
fi
elif __machine_has python ; then
if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
else
- __warn "$config_file is invalid JSON. Its settings will be ignored."
+ __error "$config_file is invalid JSON. Its settings will be ignored."
+ exit 1
fi
else
- __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
+ __error 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
+ exit 1
fi
[ ! -z "${config_channel:-}" ] && channel="$config_channel"
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.5.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.5.txt
new file mode 100644
index 0000000000..99f4fc5db2
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.5.txt
@@ -0,0 +1,214 @@
+microsoft.aspnetcore.razor.design\2.1.2\.signature.p7s
+microsoft.aspnetcore.razor.design\2.1.2\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
+microsoft.aspnetcore.razor.design\2.1.2\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props
+microsoft.aspnetcore.razor.design\2.1.2\buildMultiTargeting\Microsoft.AspNetCore.Razor.Design.props
+microsoft.aspnetcore.razor.design\2.1.2\microsoft.aspnetcore.razor.design.2.1.2.nupkg
+microsoft.aspnetcore.razor.design\2.1.2\microsoft.aspnetcore.razor.design.2.1.2.nupkg.sha512
+microsoft.aspnetcore.razor.design\2.1.2\microsoft.aspnetcore.razor.design.nuspec
+microsoft.aspnetcore.razor.design\2.1.2\tasks\net46\Microsoft.AspNetCore.Razor.Tasks.dll
+microsoft.aspnetcore.razor.design\2.1.2\tasks\netstandard2.0\Microsoft.AspNetCore.Razor.Tasks.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.AspNetCore.Razor.Language.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.CodeAnalysis.CSharp.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.CodeAnalysis.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.CodeAnalysis.Razor.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Newtonsoft.Json.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\rzc.deps.json
+microsoft.aspnetcore.razor.design\2.1.2\tools\rzc.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\rzc.runtimeconfig.json
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\microsoft.visualstudio.web.codegeneration.contracts.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\microsoft.visualstudio.web.codegeneration.contracts.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\microsoft.visualstudio.web.codegeneration.contracts.nuspec
+microsoft.visualstudio.web.codegeneration.core\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.core\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Core.dll
+microsoft.visualstudio.web.codegeneration.core\2.1.5\microsoft.visualstudio.web.codegeneration.core.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration.core\2.1.5\microsoft.visualstudio.web.codegeneration.core.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.core\2.1.5\microsoft.visualstudio.web.codegeneration.core.nuspec
+microsoft.visualstudio.web.codegeneration.design\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.design\2.1.5\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\lib\netstandard2.0\dotnet-aspnet-codegenerator-design.dll
+microsoft.visualstudio.web.codegeneration.design\2.1.5\microsoft.visualstudio.web.codegeneration.design.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration.design\2.1.5\microsoft.visualstudio.web.codegeneration.design.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.design\2.1.5\microsoft.visualstudio.web.codegeneration.design.nuspec
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win-arm\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win-arm64\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win7-x64\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win7-x86\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.dll
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\microsoft.visualstudio.web.codegeneration.entityframeworkcore.nuspec
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\Templates\DbContext\NewLocalDbContext.cshtml
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Templating.dll
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\microsoft.visualstudio.web.codegeneration.templating.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\microsoft.visualstudio.web.codegeneration.templating.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\microsoft.visualstudio.web.codegeneration.templating.nuspec
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\microsoft.visualstudio.web.codegeneration.utils.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\microsoft.visualstudio.web.codegeneration.utils.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\microsoft.visualstudio.web.codegeneration.utils.nuspec
+microsoft.visualstudio.web.codegeneration\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.dll
+microsoft.visualstudio.web.codegeneration\2.1.5\microsoft.visualstudio.web.codegeneration.2.1.5.nupkg
+microsoft.visualstudio.web.codegeneration\2.1.5\microsoft.visualstudio.web.codegeneration.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration\2.1.5\microsoft.visualstudio.web.codegeneration.nuspec
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\area.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\controller.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\identity.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\razorpage.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\view.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\lib\netstandard2.0\identitygeneratorfilesconfig.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.dll
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\microsoft.visualstudio.web.codegenerators.mvc.2.1.5.nupkg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\microsoft.visualstudio.web.codegenerators.mvc.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\microsoft.visualstudio.web.codegenerators.mvc.nuspec
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ApiControllerWithActions.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ApiControllerWithContext.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ApiEmptyController.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ControllerWithActions.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\EmptyController.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\MvcControllerWithContext.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\_LoginPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Data\ApplicationDbContext.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Data\ApplicationUser.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\IdentityHostingStartup.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_Layout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_ValidationScriptsPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_ViewStart.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account._ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.AccessDenied.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.AccessDenied.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ConfirmEmail.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ConfirmEmail.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ExternalLogin.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ExternalLogin.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Lockout.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Lockout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Login.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Login.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWith2fa.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWith2fa.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Logout.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Logout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Register.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Register.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._Layout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._ManageNav.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._StatusMessage.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ManageNavPages.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Error.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Error.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\ScaffoldingReadme.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\SupportPages._CookieConsentPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\SupportPages._ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\SupportPages._ViewStart.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\css\site.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\css\site.min.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\favicon.ico
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\images\banner1.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\images\banner2.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\images\banner3.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\js\site.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\js\site.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.eot
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.ttf
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff2
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\js\npm.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\LICENSE
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\LICENSE.md
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\dist\jquery.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\LICENSE.txt
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\MvcLayout\_Layout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\MvcLayout\Error.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\_ValidationScriptsPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Create.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\CreatePageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Delete.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\DeletePageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Details.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\DetailsPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Edit.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\EditPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Empty.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\EmptyPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\List.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\ListPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Startup\ReadMe.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Startup\Startup.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\_ValidationScriptsPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Create.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Delete.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Details.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Edit.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Empty.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\List.cshtml
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.5.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.5.txt
new file mode 100644
index 0000000000..e16aa65b04
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.5.txt
@@ -0,0 +1,205 @@
+microsoft.aspnetcore.razor.design\2.1.2\.signature.p7s
+microsoft.aspnetcore.razor.design\2.1.2\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
+microsoft.aspnetcore.razor.design\2.1.2\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props
+microsoft.aspnetcore.razor.design\2.1.2\buildMultiTargeting\Microsoft.AspNetCore.Razor.Design.props
+microsoft.aspnetcore.razor.design\2.1.2\microsoft.aspnetcore.razor.design.2.1.2.nupkg.sha512
+microsoft.aspnetcore.razor.design\2.1.2\microsoft.aspnetcore.razor.design.nuspec
+microsoft.aspnetcore.razor.design\2.1.2\tasks\net46\Microsoft.AspNetCore.Razor.Tasks.dll
+microsoft.aspnetcore.razor.design\2.1.2\tasks\netstandard2.0\Microsoft.AspNetCore.Razor.Tasks.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.AspNetCore.Razor.Language.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.CodeAnalysis.CSharp.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.CodeAnalysis.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Microsoft.CodeAnalysis.Razor.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\Newtonsoft.Json.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\rzc.deps.json
+microsoft.aspnetcore.razor.design\2.1.2\tools\rzc.dll
+microsoft.aspnetcore.razor.design\2.1.2\tools\rzc.runtimeconfig.json
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\microsoft.visualstudio.web.codegeneration.contracts.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.contracts\2.1.5\microsoft.visualstudio.web.codegeneration.contracts.nuspec
+microsoft.visualstudio.web.codegeneration.core\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.core\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Core.dll
+microsoft.visualstudio.web.codegeneration.core\2.1.5\microsoft.visualstudio.web.codegeneration.core.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.core\2.1.5\microsoft.visualstudio.web.codegeneration.core.nuspec
+microsoft.visualstudio.web.codegeneration.design\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.design\2.1.5\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\lib\netstandard2.0\dotnet-aspnet-codegenerator-design.dll
+microsoft.visualstudio.web.codegeneration.design\2.1.5\microsoft.visualstudio.web.codegeneration.design.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.design\2.1.5\microsoft.visualstudio.web.codegeneration.design.nuspec
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win-arm\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win-arm64\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win7-x64\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.design\2.1.5\runtimes\win7-x86\lib\net461\dotnet-aspnet-codegenerator-design.exe
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.dll
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\microsoft.visualstudio.web.codegeneration.entityframeworkcore.nuspec
+microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.5\Templates\DbContext\NewLocalDbContext.cshtml
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Templating.dll
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\microsoft.visualstudio.web.codegeneration.templating.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.templating\2.1.5\microsoft.visualstudio.web.codegeneration.templating.nuspec
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\microsoft.visualstudio.web.codegeneration.utils.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration.utils\2.1.5\microsoft.visualstudio.web.codegeneration.utils.nuspec
+microsoft.visualstudio.web.codegeneration\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegeneration\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.dll
+microsoft.visualstudio.web.codegeneration\2.1.5\microsoft.visualstudio.web.codegeneration.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegeneration\2.1.5\microsoft.visualstudio.web.codegeneration.nuspec
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\.signature.p7s
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\area.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\controller.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\identity.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\razorpage.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Generators\ParameterDefinitions\view.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\lib\netstandard2.0\identitygeneratorfilesconfig.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.dll
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\microsoft.visualstudio.web.codegenerators.mvc.2.1.5.nupkg.sha512
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\microsoft.visualstudio.web.codegenerators.mvc.nuspec
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ApiControllerWithActions.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ApiControllerWithContext.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ApiEmptyController.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\ControllerWithActions.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\EmptyController.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ControllerGenerator\MvcControllerWithContext.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\_LoginPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Data\ApplicationDbContext.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Data\ApplicationUser.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\IdentityHostingStartup.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_Layout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_ValidationScriptsPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\_ViewStart.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account._ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.AccessDenied.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.AccessDenied.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ConfirmEmail.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ConfirmEmail.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ExternalLogin.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ExternalLogin.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Lockout.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Lockout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Login.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Login.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWith2fa.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWith2fa.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Logout.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Logout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Register.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.Register.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._Layout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._ManageNav.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._StatusMessage.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage._ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ManageNavPages.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Error.cs.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\Pages\Error.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\ScaffoldingReadme.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\SupportPages._CookieConsentPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\SupportPages._ViewImports.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\SupportPages._ViewStart.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\css\site.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\css\site.min.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\favicon.ico
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\images\banner1.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\images\banner2.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\images\banner3.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\js\site.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\js\site.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.eot
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.svg
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.ttf
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff2
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\dist\js\npm.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\bootstrap\LICENSE
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery-validation\LICENSE.md
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\.bower.json
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\dist\jquery.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.js
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.map
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Identity\wwwroot\lib\jquery\LICENSE.txt
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\MvcLayout\_Layout.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\MvcLayout\Error.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\_ValidationScriptsPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Create.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\CreatePageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Delete.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\DeletePageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Details.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\DetailsPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Edit.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\EditPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\Empty.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\EmptyPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\List.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\RazorPageGenerator\ListPageModel.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Startup\ReadMe.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\Startup\Startup.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\_ValidationScriptsPartial.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Create.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Delete.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Details.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Edit.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\Empty.cshtml
+microsoft.visualstudio.web.codegenerators.mvc\2.1.5\Templates\ViewGenerator\List.cshtml
diff --git a/src/PackageArchive/Archive.targets b/src/PackageArchive/Archive.targets
index d50f2bad93..9775f74148 100644
--- a/src/PackageArchive/Archive.targets
+++ b/src/PackageArchive/Archive.targets
@@ -86,7 +86,7 @@
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1))
-
diff --git a/src/PackageArchive/ZipManifestGenerator/README.md b/src/PackageArchive/ZipManifestGenerator/README.md
index 902188d8fa..9922f2e465 100644
--- a/src/PackageArchive/ZipManifestGenerator/README.md
+++ b/src/PackageArchive/ZipManifestGenerator/README.md
@@ -18,7 +18,14 @@ Example: dotnet run ./archive.zip files.txt
To generate a new manifest for the incremental CI server package caches, you would run
```ps1
-$url = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-${Version}.patch.zip"
+$ProdConBuild='20180919-01'
+$Version='2.1.5'
-dotnet run $url "../Archive.CiServer.Patch/ArchiveBaseline.${Version}.txt"
+$patchUrl = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-${Version}.patch.zip"
+
+dotnet run $patchUrl "../Archive.CiServer.Patch/ArchiveBaseline.${Version}.txt"
+
+$compatPatchUrl = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-compat-${Version}.patch.zip"
+
+dotnet run $compatPatchUrl "../Archive.CiServer.Patch.Compat/ArchiveBaseline.${Version}.txt"
```
diff --git a/src/PackageArchive/ZipManifestGenerator/ZipManifestGenerator.csproj b/src/PackageArchive/ZipManifestGenerator/ZipManifestGenerator.csproj
index 88b5a48eeb..b7d3a43622 100644
--- a/src/PackageArchive/ZipManifestGenerator/ZipManifestGenerator.csproj
+++ b/src/PackageArchive/ZipManifestGenerator/ZipManifestGenerator.csproj
@@ -4,7 +4,6 @@
exe
netcoreapp2.1
false
- false
7.1
false