diff --git a/NuGet.Config b/NuGet.Config
index 10ffdab23a..09a1c2c1ec 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -17,5 +17,6 @@
+
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index a3c20a3e96..cbc7a67a0a 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -21,6 +21,9 @@
$(CoreSetupRid)
linux-x64
dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
+
+ $([System.Text.RegularExpressions.Regex]::IsMatch($(SharedFrameworkVersion), '\d*\.\d*\.\d*-'))
+ $([System.Text.RegularExpressions.Regex]::Match($(SharedFrameworkVersion), '\d*\.\d*\.\d*').get_Groups().get_Item(0).ToString())
diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index 549508206f..a7a7069abe 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -1,10 +1,11 @@
-
-
-
+
+
+
+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index b4b5978449..96de35ea2c 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
- 2.0.0
+ 2.0.3
15.4.8
2.3.2-beta1-61921-05
2.3.0-pre-20170727-1
@@ -12,7 +12,7 @@
- 2.0.1-servicing-20170926-1
+ 2.0.3-servicing-20171109-3
$(CLI_NETSDK_Version)
4.4.0-preview3-4475
@@ -30,16 +30,16 @@
0.1.1-alpha-167
1.2.1-alpha-002133
0.2.0
- 1.0.417
0.2.0-beta-000042
+ 2.0.3
notimestamp
- 2.0.0
+ 2.0.3
rtm
- 2.0.0
- 26452
+ 2.0.3
+ 125
aspnetcore-store
$(AspNetCoreVersion)-$(AspNetCoreRelease)
diff --git a/build/Test.targets b/build/Test.targets
index 4fadf70e43..0b8bc06208 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -38,6 +38,35 @@
+
+
+
+ $(OutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)
+ $(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ?$(CoreSetupBlobAccessToken)
$(SdkOutputDirectory)/nuGetPackagesArchive.lzma
nuGetPackagesArchive.$(AspNetCoreRuntimePackageFlavor).lzma
$(IntermediateDirectory)/$(NugetPackagesArchiveName)
- $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)
+ $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam)
+
@@ -88,6 +89,7 @@
+
@@ -95,7 +97,7 @@
+
@@ -122,6 +125,7 @@
+
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index b041bc344c..00afd7f30a 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -36,6 +36,7 @@
$(HostFxrDebianPackageName.ToLower())
dotnet-host
$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)
+ $(AspNetCoreRuntimePackageBrandName)-2.0.0
$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)
$(HostRid)
$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb
@@ -123,10 +124,15 @@
+ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb
+ $(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200
$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)
+
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 1781d689b5..a4f7853ca1 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -53,6 +53,7 @@
$(HostRid)
$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)
$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)
+ $(AspNetCoreRuntimePackageBrandName)-2.0.0
$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)
$(AspNetCoreVersion)
$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm
@@ -185,10 +186,15 @@
+ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm
+ $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)
$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)
+
@@ -213,7 +219,7 @@
+
@@ -241,6 +248,7 @@
+
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 8f857caf1f..bbb61cd5fb 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -303,7 +303,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
result.Should().NotBeNull();
- result.Args.Should().Contain("--fx-version 2.0.0");
+ result.Args.Should().Contain("--fx-version 2.0.3");
}
[Fact]