Skip to content

Commit bd735ed

Browse files
bricelambricelam
committed
Stop flowing Microsoft.NETCore.App
1 parent 6b4ee13 commit bd735ed

File tree

6 files changed

+39
-75
lines changed

6 files changed

+39
-75
lines changed

Diff for: ‎Directory.Build.targets

-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
<Project>
22
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3-
4-
<ItemGroup>
5-
<FrameworkReference Update="Microsoft.NETCore.App"
6-
Condition="'$(TargetFramework)' == 'net6.0'"
7-
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
8-
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
9-
</ItemGroup>
103

114
<Target Name="GetCustomAssemblyAttributes"
125
BeforeTargets="GetAssemblyAttributes"

Diff for: ‎eng/Version.Details.xml

+22-39
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,49 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.6.21307.1">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.6.21276.2">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
6+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-preview.6.21307.1">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-preview.6.21276.2">
99
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
10+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.6.21307.1">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.6.21276.2">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
14+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.6.21307.1">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.6.21276.2">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
18+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.6.21307.1">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.6.21276.2">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
22+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21307.1">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21276.2">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
26+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21307.1">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21276.2">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
30+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-preview.6.21307.1">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-preview.6.21276.2">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
34+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21307.1">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21276.2">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
38+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21307.1">
40+
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.6.21276.2">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
42+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21307.1">
44+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.6.21276.2">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
47-
</Dependency>
48-
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
49-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.6.21307.1">
50-
<Uri>https://github.com/dotnet/runtime</Uri>
51-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
52-
</Dependency>
53-
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.6.21307.1">
54-
<Uri>https://github.com/dotnet/runtime</Uri>
55-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
56-
</Dependency>
57-
<Dependency Name="System.ComponentModel.Annotations" Version="6.0.0-preview.5.21226.1">
58-
<Uri>https://github.com/dotnet/runtime</Uri>
59-
<Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
60-
</Dependency>
61-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.6.21307.1">
62-
<Uri>https://github.com/dotnet/runtime</Uri>
63-
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
46+
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
6447
</Dependency>
6548
</ProductDependencies>
6649
<ToolsetDependencies>

Diff for: ‎eng/Versions.props

+11-15
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,17 @@
1515
<UsingToolXliff>False</UsingToolXliff>
1616
</PropertyGroup>
1717
<PropertyGroup Label="Dependencies from dotnet/runtime">
18-
<SystemCollectionsImmutableVersion>6.0.0-preview.6.21307.1</SystemCollectionsImmutableVersion>
19-
<SystemComponentModelAnnotationsVersion>6.0.0-preview.5.21226.1</SystemComponentModelAnnotationsVersion>
20-
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.6.21307.1</SystemDiagnosticsDiagnosticSourceVersion>
21-
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsCachingMemoryVersion>
22-
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsConfigurationVersion>
23-
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
24-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
25-
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsConfigurationJsonVersion>
26-
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsDependencyInjectionVersion>
27-
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsDependencyModelVersion>
28-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
29-
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.6.21307.1</MicrosoftExtensionsLoggingVersion>
30-
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.6.21307.1</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.6.21307.1</MicrosoftNETCoreAppRuntimewinx64Version>
32-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.6.21307.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
18+
<SystemCollectionsImmutableVersion>6.0.0-preview.6.21276.2</SystemCollectionsImmutableVersion>
19+
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.6.21276.2</SystemDiagnosticsDiagnosticSourceVersion>
20+
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsLoggingVersion>
3329
</PropertyGroup>
3430
<PropertyGroup Label="Other dependencies">
3531
<MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>

Diff for: ‎eng/helix.proj

-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
<HelixBuild>t001</HelixBuild>
2727
</PropertyGroup>
2828

29-
<ItemGroup>
30-
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
31-
<PackageType>runtime</PackageType>
32-
</AdditionalDotNetPackage>
33-
</ItemGroup>
34-
3529
<ItemGroup>
3630
<XUnitProject Include="$(RepoRoot)/test/**/*.csproj"/>
3731
<XUnitProject Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>

Diff for: ‎global.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.100-preview.3.21202.5",
3+
"dotnet": "6.0.100-preview.4.21255.9",
44
"runtimes": {
55
"dotnet": [
6-
"3.1.14",
7-
"5.0.5",
8-
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
6+
"3.1.16",
7+
"5.0.7"
98
],
109
"aspnetcore": [
11-
"3.1.14",
12-
"5.0.5"
10+
"3.1.16",
11+
"5.0.7"
1312
]
1413
}
1514
},
1615
"sdk": {
17-
"version": "6.0.100-preview.3.21202.5",
16+
"version": "6.0.100-preview.4.21255.9",
1817
"allowPrerelease": true,
1918
"rollForward": "latestMajor"
2019
},

Diff for: ‎src/EFCore/EFCore.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Microsoft.EntityFrameworkCore.DbSet
2424
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
2525
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
2626
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
27-
<PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
2827
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
2928
</ItemGroup>
3029

0 commit comments

Comments
 (0)