diff --git a/build/dependencies.props b/build/dependencies.props
index fbcb1738ae..98d48d83db 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -6,39 +6,40 @@
0.9.9
- 2.1.1
+ 2.1.2-rtm-30913
2.1.3-rtm-15802
- 2.1.2
+ 2.1.3-rtm-30913
+ 2.1.3-rtm-30913
2.1.1
2.1.1
- 2.1.1
- 2.1.1
- 2.1.1
+ 2.1.2-rtm-30913
+ 2.1.2-rtm-30913
+ 2.1.2-rtm-30913
2.1.1
- 2.1.1
+ 2.1.2-rtm-30913
2.1.1
2.1.1
- 2.1.2
- 2.1.2
- 2.1.1
+ 2.1.3-rtm-30913
+ 2.1.3-rtm-30913
+ 2.1.2-rtm-30913
2.1.1
- 2.1.2
+ 2.1.3-rtm-30913
2.1.1
2.1.1
2.1.1
2.1.0
15.6.82
15.6.82
- 2.1.1
- 2.1.1
- 2.1.1
+ 2.1.2-rtm-30913
+ 2.1.2-rtm-30913
+ 2.1.2-rtm-30913
2.1.1
2.1.1
- 2.1.2
- 2.1.1
+ 2.1.3-servicing-26708-02
+ 2.1.2-rtm-30913
15.6.1
2.1.1
- 2.1.1
+ 2.1.3-rtm-30913
2.0.3
0.20.0
3.12.1
@@ -47,7 +48,7 @@
4.5.0
0.8.0
2.3.1
- 2.4.0-beta.1.build3945
+ 2.4.0-rc.1.build4038
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
index dfcd611198..0db9c70633 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
index d5b6962b3b..5e029bbfd5 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
@@ -11,7 +11,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index fa1f9baf9a..1e3b76e3e8 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -13,7 +13,6 @@
- MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion=$(MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion);
MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion=$(MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion);
MicrosoftAspNetCoreAuthenticationCookiesPackageVersion=$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion);
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
index 69b9fbdd55..4716d05f5b 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
@@ -16,7 +16,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
index c8da4a7f07..2e90989e97 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
@@ -16,7 +16,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
index 2e3f0a2e01..43aa9c21f6 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
index 9f2e2e8560..b57b346386 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
index 2bce6ca368..9a435ae260 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
@@ -12,7 +12,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
index c88c096919..020f592ccd 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index b3a92fb83c..8b2745c15a 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -13,7 +13,6 @@
- MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
MicrosoftAspNetCorePackageVersion=$(MicrosoftAspNetCorePackageVersion);
MicrosoftAspNetCoreHttpsPolicyPackageVersion=$(MicrosoftAspNetCoreHttpsPolicyPackageVersion);
MicrosoftAspNetCoreMvcPackageVersion=$(MicrosoftAspNetCoreMvcPackageVersion);
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in
index 12226d65e3..24e96c27a4 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in
@@ -11,7 +11,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
index 499317d850..82ec5a5dd2 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
@@ -11,7 +11,7 @@
-
+
diff --git a/test/GenerateTestProps.targets b/test/GenerateTestProps.targets
index 9b79c9ca02..c4eaba5740 100644
--- a/test/GenerateTestProps.targets
+++ b/test/GenerateTestProps.targets
@@ -1,9 +1,15 @@
- RestoreSources=$([MSBuild]::Escape($(RestoreSources)))
- $(PropsProperties);RuntimeFrameworkVersion=$(RuntimeFrameworkVersion)
- $(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion)
+
+ RestoreSources=$([MSBuild]::Escape($(RestoreSources)));
+ RuntimeFrameworkVersion=$(RuntimeFrameworkVersion);
+ MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion);
+ BundledAspNetCoreAllTargetFrameworkVersion=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1]);
+ BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion);
+ BundledAspNetCoreAppTargetFrameworkVersion=$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[1]);
+ BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)
+
${RestoreSources}
${RuntimeFrameworkVersion}
${MicrosoftNETSdkRazorPackageVersion}
+ ${BundledAspNetCoreAllTargetFrameworkVersion}
+ ${BundledAspNetCoreAllPackageVersion}
+ ${BundledAspNetCoreAppTargetFrameworkVersion}
+ ${BundledAspNetCoreAppPackageVersion}