File tree Expand file tree Collapse file tree 6 files changed +11
-13
lines changed
Framework/App.Runtime/src
Installers/Windows/WindowsHostingBundle Expand file tree Collapse file tree 6 files changed +11
-13
lines changed Original file line number Diff line number Diff line change 298
298
<Uri >https://github.com/dotnet/runtime</Uri >
299
299
<Sha >72b7d236ad634c2280c73499ebfc2b594995ec06</Sha >
300
300
</Dependency >
301
- <Dependency Name =" Microsoft.NETCore.App.Internal" Version =" 6.0.0-alpha.1.20560.10" >
302
- <Uri >https://github.com/dotnet/runtime</Uri >
303
- <Sha >72b7d236ad634c2280c73499ebfc2b594995ec06</Sha >
304
- </Dependency >
305
301
<Dependency Name =" Microsoft.NETCore.BrowserDebugHost.Transport" Version =" 6.0.0-alpha.1.20560.10" >
306
302
<Uri >https://github.com/dotnet/runtime</Uri >
307
303
<Sha >72b7d236ad634c2280c73499ebfc2b594995ec06</Sha >
Original file line number Diff line number Diff line change 65
65
<PropertyGroup Label =" Automated" >
66
66
<!-- Packages from dotnet/runtime -->
67
67
<MicrosoftExtensionsDependencyModelVersion >6.0.0-alpha.1.20560.10</MicrosoftExtensionsDependencyModelVersion >
68
- <MicrosoftNETCoreAppInternalVersion >6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppInternalVersion >
69
68
<MicrosoftNETCoreAppRefVersion >6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppRefVersion >
70
69
<MicrosoftNETCoreAppRuntimewinx64Version >6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppRuntimewinx64Version >
71
70
<MicrosoftNETCoreBrowserDebugHostTransportVersion >6.0.0-alpha.1.20560.10</MicrosoftNETCoreBrowserDebugHostTransportVersion >
Original file line number Diff line number Diff line change 161
161
<!--
162
162
When the targeting pack builds, it has exactly the same version as the shared framework. Passing
163
163
SharedFxVersion because that's needed even when the targeting pack isn't building.
164
+ Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
164
165
-->
165
- <Command Condition =" $(IsWindowsHelixQueue)" >call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalVersion ) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command >
166
- <Command Condition =" !$(IsWindowsHelixQueue)" >./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalVersion ) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command >
166
+ <Command Condition =" $(IsWindowsHelixQueue)" >call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion ) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command >
167
+ <Command Condition =" !$(IsWindowsHelixQueue)" >./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion ) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command >
167
168
<Command Condition =" $(HelixCommand) != ''" >$(HelixCommand)</Command >
168
169
<Timeout >$(HelixTimeout)</Timeout >
169
170
</HelixWorkItem >
Original file line number Diff line number Diff line change 7
7
"runtimes" : {
8
8
"dotnet/x64" : [
9
9
" 2.1.18" ,
10
- " $(MicrosoftNETCoreAppInternalVersion )"
10
+ " $(MicrosoftNETCoreBrowserDebugHostTransportVersion )"
11
11
],
12
12
"dotnet/x86" : [
13
- " $(MicrosoftNETCoreAppInternalVersion )"
13
+ " $(MicrosoftNETCoreBrowserDebugHostTransportVersion )"
14
14
],
15
15
"aspnetcore/x64" : [
16
16
" 3.1.4"
Original file line number Diff line number Diff line change @@ -30,9 +30,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
30
30
<!-- Target framework is not appended to this because native assets do not have a target framework. -->
31
31
<NativeAssetsPackagePath >runtimes/$(RuntimeIdentifier)/native/</NativeAssetsPackagePath >
32
32
33
+ <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
33
34
<DotNetRuntimeArchiveFileName >dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName >
34
- <DotNetRuntimeDownloadUrl >$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalVersion )/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadUrl >
35
- <DotNetRuntimePrivateDownloadUrl >$(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalVersion )/$(DotNetRuntimeArchiveFileName)</DotNetRuntimePrivateDownloadUrl >
35
+ <DotNetRuntimeDownloadUrl >$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion )/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadUrl >
36
+ <DotNetRuntimePrivateDownloadUrl >$(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion )/$(DotNetRuntimeArchiveFileName)</DotNetRuntimePrivateDownloadUrl >
36
37
<DotNetRuntimeArchive >$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive >
37
38
38
39
<!-- Setting this suppresses getting documentation .xml files in the shared runtime output. -->
Original file line number Diff line number Diff line change 27
27
<DotNetPrivateAssetRootUrl Condition =" ! $(DotNetPrivateAssetRootUrl.EndsWith('/'))" >$(DotNetPrivateAssetRootUrl)/</DotNetPrivateAssetRootUrl >
28
28
</PropertyGroup >
29
29
30
+ <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for NETCoreApp. -->
30
31
<ItemGroup >
31
- <RemoteAsset Include =" Runtime/$(MicrosoftNETCoreAppInternalVersion )/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe" >
32
+ <RemoteAsset Include =" Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion )/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe" >
32
33
<TargetFileName >dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe</TargetFileName >
33
34
</RemoteAsset >
34
- <RemoteAsset Include =" Runtime/$(MicrosoftNETCoreAppInternalVersion )/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe" >
35
+ <RemoteAsset Include =" Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion )/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe" >
35
36
<TargetFileName >dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe</TargetFileName >
36
37
</RemoteAsset >
37
38
</ItemGroup >
You can’t perform that action at this time.
0 commit comments