diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6e6d343eb7..8dd3f5d309 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -96,11 +96,11 @@
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppRuntimeVersion)
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppRuntimeVersion)
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppRefPackageVersion)
diff --git a/build/runtimes.props b/build/runtimes.props
index 0c890e31f2..d5cd1f7781 100644
--- a/build/runtimes.props
+++ b/build/runtimes.props
@@ -1,12 +1,12 @@
-
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index b7a2b5ab52..b380b39c0e 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -165,15 +165,15 @@ and are generated based on the last package release.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e66191bd18..f3aef6be8e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -293,79 +293,79 @@
https://github.com/aspnet/Extensions
3e7f99fbe3c5e775f5c175238eed87523782fe13
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
a28176b5ec68b6da1472934fe9493790d1665cae
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
@@ -373,7 +373,15 @@
https://github.com/dotnet/core-setup
3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b
-
+
+ https://github.com/dotnet/core-setup
+ 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b
+
+
+
https://github.com/dotnet/core-setup
3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b
@@ -384,7 +392,7 @@
-
+
https://github.com/dotnet/corefx
7e56d8bd8b224d834b782a98bfd7035f71c3f547
diff --git a/eng/Versions.props b/eng/Versions.props
index 4363aa2a7e..936a51bcbe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,7 +55,8 @@
1.0.0-beta.19302.2
3.0.0-preview7-27810-02
- 3.0.0-preview7-27810-02
+ 3.0.0-preview7-27810-02
+ 3.0.0-preview7-27810-02
2.1.0-preview7-27810-02
4.6.0-preview7.19309.5
@@ -166,6 +167,13 @@
Versions below this comment are not managed by automation and can be changed as needed.
-->
+
+
+ $(MicrosoftNETCoreAppRuntimewinx64PackageVersion)
+
3.0.0-build-20190530.3
@@ -239,6 +247,7 @@
$(RestoreSources);
+ https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json;
diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index a217240bb8..b22f887bf5 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -43,4 +43,19 @@
+
+
+
+
+ Microsoft.NETCore.App.Runtime.**RID**
+
+
+
+
+
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 901f9f75e4..1f671c0bd6 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -78,8 +78,8 @@ Usage: dotnet build /t:Helix src/MyTestProject.csproj
$(TargetFileName)
@(HelixPreCommand)
@(HelixPostCommand)
- call runtests.cmd $(TargetFileName) $(TargetFrameworkIdentifier) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion) $(_HelixFriendlyNameTargetQueue)
- ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion) $(_HelixFriendlyNameTargetQueue)
+ call runtests.cmd $(TargetFileName) $(TargetFrameworkIdentifier) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue)
+ ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue)
$(HelixTimeout)
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
index 5325b54a4f..c8a6be74e9 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -28,8 +28,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
runtimes/$(RuntimeIdentifier)/native/
- dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)
- $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppPackageVersion)/$(DotNetRuntimeArchiveFileName)
+ dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)
+ $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppRuntimeVersion)/$(DotNetRuntimeArchiveFileName)
$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)
@@ -96,7 +96,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
x64_arm64\$(CrossgenToolPackagePath)
x86_arm\$(CrossgenToolPackagePath)
- $([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'runtime.$(RuntimeIdentifier).microsoft.netcore.app', '$(MicrosoftNETCoreAppPackageVersion)'))
+ $([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', '$(MicrosoftNETCoreAppRuntimeVersion)'))
$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))
$([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)'))
$(AssetTargetFallback);native,Version=0.0
@@ -108,7 +108,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Runtime;Native
-
+
Platform=$(TargetArchitecture)
@@ -231,7 +231,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index f2052f95eb..8cde3262d9 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -24,8 +24,8 @@
<_Parameter2>$(TargetRuntimeIdentifier)
- <_Parameter1>MicrosoftNETCoreAppPackageVersion
- <_Parameter2>$(MicrosoftNETCoreAppPackageVersion)
+ <_Parameter1>MicrosoftNETCoreAppRuntimeVersion
+ <_Parameter2>$(MicrosoftNETCoreAppRuntimeVersion)
<_Parameter1>SharedFxDependencies
diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs
index b81d6af975..ede8565f85 100644
--- a/src/Framework/test/TestData.cs
+++ b/src/Framework/test/TestData.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore
{
public static string GetSharedFxVersion() => GetTestDataValue("SharedFxVersion");
- public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppPackageVersion");
+ public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppRuntimeVersion");
public static string GetRepositoryCommit() => GetTestDataValue("RepositoryCommit");
diff --git a/src/Installers/Debian/Runtime/Debian.Runtime.debproj b/src/Installers/Debian/Runtime/Debian.Runtime.debproj
index 233d954c56..7f374e5288 100644
--- a/src/Installers/Debian/Runtime/Debian.Runtime.debproj
+++ b/src/Installers/Debian/Runtime/Debian.Runtime.debproj
@@ -11,7 +11,7 @@
$(RuntimeInstallerBaseName)-$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppRuntimeVersion)
$(DotnetRuntimeDependencyVersion.Substring(0, $(DotnetRuntimeDependencyVersion.IndexOf('-'))))~$(DotnetRuntimeDependencyVersion.Substring($([MSBuild]::Add($(DotnetRuntimeDependencyVersion.IndexOf('-')), 1))))
$(SharedFxProductName)
diff --git a/src/Installers/Rpm/Rpm.Runtime.Common.targets b/src/Installers/Rpm/Rpm.Runtime.Common.targets
index 198e55120b..5cd0ee676f 100644
--- a/src/Installers/Rpm/Rpm.Runtime.Common.targets
+++ b/src/Installers/Rpm/Rpm.Runtime.Common.targets
@@ -24,6 +24,6 @@
-
+
diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
index f2d3e34ef3..cafd5c3d1e 100644
--- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
+++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
@@ -21,7 +21,7 @@
-
+
diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets
index 36f4cb8cd9..dd2b113f35 100644
--- a/src/Installers/Windows/WindowsHostingBundle/Product.targets
+++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets
@@ -7,15 +7,15 @@
-
+
x64
DotNetRedistLtsInstallerx64
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppRuntimeVersion)
-
+
x86
DotNetRedistLtsInstallerx86
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppRuntimeVersion)
@@ -26,11 +26,11 @@
-
- dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-win-x64.exe
+
+ dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe
-
- dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-win-x86.exe
+
+ dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe
@@ -52,7 +52,7 @@
-
+
DotNetRedistLtsInstallerProductVersion%(Platforms.Identity)
DotNetRedistLtsInstallerProductCode%(Platforms.Identity)
DotNetRedistLtsInstallerUpgradeCode%(Platforms.Identity)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index 1378977d6e..9a597e65a2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -18,7 +18,7 @@
MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion);
MicrosoftExtensionsHostingPackageVersion=$(MicrosoftExtensionsHostingPackageVersion);
- MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);
+ MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index dde6aec5f8..9a9d1ac81f 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -14,7 +14,7 @@
MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion);
MicrosoftExtensionsHostingPackageVersion=$(MicrosoftExtensionsHostingPackageVersion);
- MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);
+ MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
index cdad73166b..9010a78bd5 100644
--- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
+++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
@@ -7,7 +7,8 @@
RestoreSources=$([MSBuild]::Escape("$(RestoreSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
- MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);
+ MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
+ MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion);
MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion);
MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion);
diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in
index d6caf0e26b..f56c6e3721 100644
--- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in
+++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in
@@ -11,20 +11,27 @@
+ DefaultRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
+ LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
+ TargetingPackVersion="${MicrosoftNETCoreAppRefPackageVersion}" />
+
+
+
+
+