Skip to content

Commit

Permalink
Revert "Start flowing Microsoft.NETCore.App (dotnet#24407)"
Browse files Browse the repository at this point in the history
This reverts commit afb7a04.
  • Loading branch information
bricelam committed Jun 3, 2021
1 parent c09204f commit a6d7ea2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 36 deletions.
7 changes: 0 additions & 7 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(TargetFramework)' == 'net6.0'"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
</ItemGroup>

<Target Name="GetCustomAssemblyAttributes"
BeforeTargets="GetAssemblyAttributes"
Expand Down
13 changes: 0 additions & 13 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21281.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21281.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
</Dependency>
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.6.21281.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.6.21281.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fea7ff2cce79da2df9cf1c50ce215287750f055e</Sha>
Expand Down
3 changes: 0 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.6.21281.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.6.21281.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.6.21281.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.6.21281.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.6.21281.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.6.21281.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>
Expand Down
6 changes: 0 additions & 6 deletions eng/helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
<HelixBuild>t001</HelixBuild>
</PropertyGroup>

<ItemGroup>
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
<PackageType>runtime</PackageType>
</AdditionalDotNetPackage>
</ItemGroup>

<ItemGroup>
<XUnitProject Include="$(RepoRoot)/test/**/*.csproj"/>
<XUnitProject Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>
Expand Down
13 changes: 6 additions & 7 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{
"tools": {
"dotnet": "6.0.100-preview.3.21202.5",
"dotnet": "6.0.100-preview.4.21255.9",
"runtimes": {
"dotnet": [
"3.1.14",
"5.0.5",
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
"3.1.15",
"5.0.6"
],
"aspnetcore": [
"3.1.14",
"5.0.5"
"3.1.15",
"5.0.6"
]
}
},
"sdk": {
"version": "6.0.100-preview.3.21202.5",
"version": "6.0.100-preview.4.21255.9",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
Expand Down

0 comments on commit a6d7ea2

Please sign in to comment.