Skip to content

Commit 634b50e

Browse files
jkoritzinskydougbu
andauthored
Remove usage of the Microsoft.NETCore.Internal package and replace with other non-shipping packages from dotnet/runtime to get a non-shipping version. (#27737)
* Remove usage of the Microsoft.NETCore.Internal package and replace with other non-shipping packages from dotnet/runtime to get a non-shipping version. * Use BrowserDebugHost as the only sentinel package. * Apply suggestions from code review - adjust version properties to align with 44c0e66 / #27784 Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
1 parent c1b0e65 commit 634b50e

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

eng/Version.Details.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,6 @@
298298
<Uri>https://github.com/dotnet/runtime</Uri>
299299
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
300300
</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>
305301
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-alpha.1.20560.10">
306302
<Uri>https://github.com/dotnet/runtime</Uri>
307303
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>

eng/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/runtime -->
6767
<MicrosoftExtensionsDependencyModelVersion>6.0.0-alpha.1.20560.10</MicrosoftExtensionsDependencyModelVersion>
68-
<MicrosoftNETCoreAppInternalVersion>6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppInternalVersion>
6968
<MicrosoftNETCoreAppRefVersion>6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppRefVersion>
7069
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppRuntimewinx64Version>
7170
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-alpha.1.20560.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>

eng/targets/Helix.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,10 @@
161161
<!--
162162
When the targeting pack builds, it has exactly the same version as the shared framework. Passing
163163
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.
164165
-->
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>
167168
<Command Condition="$(HelixCommand) != ''">$(HelixCommand)</Command>
168169
<Timeout>$(HelixTimeout)</Timeout>
169170
</HelixWorkItem>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.18",
10-
"$(MicrosoftNETCoreAppInternalVersion)"
10+
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1111
],
1212
"dotnet/x86": [
13-
"$(MicrosoftNETCoreAppInternalVersion)"
13+
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1414
],
1515
"aspnetcore/x64": [
1616
"3.1.4"

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
3030
<!-- Target framework is not appended to this because native assets do not have a target framework. -->
3131
<NativeAssetsPackagePath>runtimes/$(RuntimeIdentifier)/native/</NativeAssetsPackagePath>
3232

33+
<!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
3334
<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>
3637
<DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
3738

3839
<!-- Setting this suppresses getting documentation .xml files in the shared runtime output. -->

src/Installers/Windows/WindowsHostingBundle/Product.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727
<DotNetPrivateAssetRootUrl Condition=" ! $(DotNetPrivateAssetRootUrl.EndsWith('/'))">$(DotNetPrivateAssetRootUrl)/</DotNetPrivateAssetRootUrl>
2828
</PropertyGroup>
2929

30+
<!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for NETCoreApp. -->
3031
<ItemGroup>
31-
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreAppInternalVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe">
32+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe">
3233
<TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe</TargetFileName>
3334
</RemoteAsset>
34-
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreAppInternalVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe">
35+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe">
3536
<TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe</TargetFileName>
3637
</RemoteAsset>
3738
</ItemGroup>

0 commit comments

Comments
 (0)