diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eef7fb9f5c0..de5e1137d4a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -298,10 +298,6 @@ https://github.com/dotnet/runtime 72b7d236ad634c2280c73499ebfc2b594995ec06 - - https://github.com/dotnet/runtime - 72b7d236ad634c2280c73499ebfc2b594995ec06 - https://github.com/dotnet/runtime 72b7d236ad634c2280c73499ebfc2b594995ec06 diff --git a/eng/Versions.props b/eng/Versions.props index 6efb49bbbbda..751186a579e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,6 @@ 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 6.0.0-alpha.1.20560.10 6.0.0-alpha.1.20560.10 6.0.0-alpha.1.20560.10 diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 0d55eb1cdad5..b37916800f30 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -161,9 +161,10 @@ - call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) - ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) + call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) + ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) $(HelixCommand) $(HelixTimeout) diff --git a/global.json b/global.json index 3518cdae0a77..38c6c34a0c38 100644 --- a/global.json +++ b/global.json @@ -7,10 +7,10 @@ "runtimes": { "dotnet/x64": [ "2.1.18", - "$(MicrosoftNETCoreAppInternalVersion)" + "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ], "dotnet/x86": [ - "$(MicrosoftNETCoreAppInternalVersion)" + "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ], "aspnetcore/x64": [ "3.1.4" diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index b1e2c92ec56e..34525207bc4c 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -30,9 +30,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant runtimes/$(RuntimeIdentifier)/native/ + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) - $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalVersion)/$(DotNetRuntimeArchiveFileName) - $(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalVersion)/$(DotNetRuntimeArchiveFileName) + $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/$(DotNetRuntimeArchiveFileName) + $(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/$(DotNetRuntimeArchiveFileName) $(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName) diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 119d397bdd5e..070507053fbc 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -27,11 +27,12 @@ $(DotNetPrivateAssetRootUrl)/ + - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe