Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 66bcc2d

Browse files
ViktorHoferViktorHofer
authored
Upgrade dotnet SDK to 3.0-preview3 (#36859)
* Upgrade SDK to 3.0 * Remove asp and desktop framework references * Manual darc update from build '20190415.1' * Suppress type overlap with ns2.1 * Make SDK use output of core-setup for both ref and runtime SDK is ignoring RuntimeFrameworkVersion for ref packs. Set TargetingPackVersion on KnownFrameworkReference instead. dotnet/sdk#3129
1 parent 339f951 commit 66bcc2d

File tree

5 files changed

+146
-46
lines changed

5 files changed

+146
-46
lines changed

‎eng/Version.Details.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,69 +30,69 @@
3030
<Uri>https://github.com/dotnet/corefx</Uri>
3131
<Sha>81e0e2cb79e272e6e270c6562017b64f9c773e99</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19214.2">
33+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19215.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
35+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
3636
</Dependency>
3737
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19214.1">
3838
<Uri>https://github.com/dotnet/standard</Uri>
3939
<Sha>92f85005229d728cff057d52579560cd86a511a8</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19214.2">
41+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19215.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
43+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19214.2">
45+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19215.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
47+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19214.2">
49+
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19215.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
51+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19214.2">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19215.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
55+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19214.2">
57+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19215.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
59+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19214.2">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19215.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
63+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19214.2">
65+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19215.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
67+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19214.2">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19215.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
71+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19214.2">
73+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19215.1">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
75+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19214.2">
77+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19215.1">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
79+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19214.2">
81+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19215.1">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
83+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19214.2">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19215.1">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
87+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19214.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19215.1">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
91+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19214.2">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19215.1">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha>
95+
<Sha>f539e336459b393a1cd848e3318aebae0e3895c5</Sha>
9696
</Dependency>
9797
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190313.3">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
</PropertyGroup>
2424
<PropertyGroup>
2525
<!-- Arcade dependencies -->
26-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetApiCompatPackageVersion>
27-
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetSourceRewriterPackageVersion>
28-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetCodeAnalysisPackageVersion>
29-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetGenAPIPackageVersion>
30-
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetGenFacadesPackageVersion>
31-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19214.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
32-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19214.2</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
33-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetBuildTasksPackagingPackageVersion>
34-
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetCoreFxTestingPackageVersion>
35-
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetRemoteExecutorPackageVersion>
36-
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
37-
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19214.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
38-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19214.2</MicrosoftDotNetVersionToolsTasksPackageVersion>
26+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetApiCompatPackageVersion>
27+
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetSourceRewriterPackageVersion>
28+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetCodeAnalysisPackageVersion>
29+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetGenAPIPackageVersion>
30+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetGenFacadesPackageVersion>
31+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19215.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
32+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19215.1</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
33+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
34+
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetCoreFxTestingPackageVersion>
35+
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetRemoteExecutorPackageVersion>
36+
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
37+
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19215.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
38+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19215.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
3939
<!-- Core-setup dependencies -->
4040
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27614-10</MicrosoftNETCoreAppPackageVersion>
4141
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview5-27614-10</MicrosoftNETCoreDotNetHostPackageVersion>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "2.2.103"
3+
"dotnet": "3.0.100-preview3-010431"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19214.2",
7-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19214.2",
6+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19215.1",
7+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19215.1",
88
"Microsoft.NET.Sdk.IL": "3.0.0-preview5-27614-72"
99
}
1010
}

‎pkg/test/frameworkSettings/netcoreapp3.0/settings.targets‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
<!-- use the most recent MS.NETCore.App we have from upstack -->
66
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
77
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<!-- SDK doesn't honor RuntimeFrameworkVersion for targeting pack-->
11+
<KnownFrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(RuntimeFrameworkVersion)" />
12+
13+
<!-- Temporary till SDK supports transitive framework references. -->
14+
<KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
15+
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
16+
</ItemGroup>
17+
818
<!-- Unix CoreLib contains EventRegistrationToken but no other
919
types from System.Runtime.InteropServices.WindowsRuntime.
1020
https://github.com/dotnet/corefx/issues/35792 -->

‎pkg/test/frameworkSettings/netstandard2.1/settings.targets‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<Project>
2+
<!-- Issue https://github.com/dotnet/corefx/issues/36719 NS2.1 overlaps with existing ns2.0 libs -->
3+
<ItemGroup>
4+
<!-- System.Buffers -->
5+
<IgnoredTypes Include="System.Buffers.ArrayPool`1" />
6+
7+
<!-- System.Memory -->
8+
<IgnoredTypes Include="System.Buffers.Binary.BinaryPrimitives" />
9+
<IgnoredTypes Include="System.Buffers.BuffersExtensions" />
10+
<IgnoredTypes Include="System.Buffers.IBufferWriter`1" />
11+
<IgnoredTypes Include="System.Buffers.IMemoryOwner`1" />
12+
<IgnoredTypes Include="System.Buffers.IPinnable" />
13+
<IgnoredTypes Include="System.Buffers.MemoryHandle" />
14+
<IgnoredTypes Include="System.Buffers.MemoryManager`1" />
15+
<IgnoredTypes Include="System.Buffers.MemoryPool`1" />
16+
<IgnoredTypes Include="System.Buffers.OperationStatus" />
17+
<IgnoredTypes Include="System.Buffers.ReadOnlySequence`1" />
18+
<IgnoredTypes Include="System.Buffers.ReadOnlySequence`1/Enumerator" />
19+
<IgnoredTypes Include="System.Buffers.ReadOnlySequenceSegment`1" />
20+
<IgnoredTypes Include="System.Buffers.StandardFormat" />
21+
<IgnoredTypes Include="System.Buffers.Text.Base64" />
22+
<IgnoredTypes Include="System.Buffers.Text.Utf8Formatter" />
23+
<IgnoredTypes Include="System.Buffers.Text.Utf8Parser" />
24+
<IgnoredTypes Include="System.Memory`1" />
25+
<IgnoredTypes Include="System.MemoryExtensions" />
26+
<IgnoredTypes Include="System.ReadOnlyMemory`1" />
27+
<IgnoredTypes Include="System.ReadOnlySpan`1" />
28+
<IgnoredTypes Include="System.ReadOnlySpan`1/Enumerator" />
29+
<IgnoredTypes Include="System.Runtime.InteropServices.MemoryMarshal" />
30+
<IgnoredTypes Include="System.Runtime.InteropServices.SequenceMarshal" />
31+
<IgnoredTypes Include="System.SequencePosition" />
32+
<IgnoredTypes Include="System.Span`1" />
33+
<IgnoredTypes Include="System.Span`1/Enumerator" />
34+
35+
<!-- System.Numerics.Vectors -->
36+
<IgnoredTypes Include="System.Numerics.Matrix3x2" />
37+
<IgnoredTypes Include="System.Numerics.Matrix4x4" />
38+
<IgnoredTypes Include="System.Numerics.Plane" />
39+
<IgnoredTypes Include="System.Numerics.Quaternion" />
40+
<IgnoredTypes Include="System.Numerics.Vector" />
41+
<IgnoredTypes Include="System.Numerics.Vector`1" />
42+
<IgnoredTypes Include="System.Numerics.Vector2" />
43+
<IgnoredTypes Include="System.Numerics.Vector3" />
44+
<IgnoredTypes Include="System.Numerics.Vector4" />
45+
46+
<!-- System.Reflection.DispatchProxy -->
47+
<IgnoredTypes Include="System.Reflection.DispatchProxy" />
48+
49+
<!-- System.Reflection.Emit -->
50+
<IgnoredTypes Include="System.Reflection.Emit.AssemblyBuilder" />
51+
<IgnoredTypes Include="System.Reflection.Emit.AssemblyBuilderAccess" />
52+
<IgnoredTypes Include="System.Reflection.Emit.ConstructorBuilder" />
53+
<IgnoredTypes Include="System.Reflection.Emit.EnumBuilder" />
54+
<IgnoredTypes Include="System.Reflection.Emit.EventBuilder" />
55+
<IgnoredTypes Include="System.Reflection.Emit.FieldBuilder" />
56+
<IgnoredTypes Include="System.Reflection.Emit.GenericTypeParameterBuilder" />
57+
<IgnoredTypes Include="System.Reflection.Emit.MethodBuilder" />
58+
<IgnoredTypes Include="System.Reflection.Emit.ModuleBuilder" />
59+
<IgnoredTypes Include="System.Reflection.Emit.PropertyBuilder" />
60+
<IgnoredTypes Include="System.Reflection.Emit.TypeBuilder" />
61+
62+
<!-- System.Reflection.Emit.ILGeneration -->
63+
<IgnoredTypes Include="System.Reflection.Emit.CustomAttributeBuilder" />
64+
<IgnoredTypes Include="System.Reflection.Emit.ILGenerator" />
65+
<IgnoredTypes Include="System.Reflection.Emit.Label" />
66+
<IgnoredTypes Include="System.Reflection.Emit.LocalBuilder" />
67+
<IgnoredTypes Include="System.Reflection.Emit.ParameterBuilder" />
68+
<IgnoredTypes Include="System.Reflection.Emit.SignatureHelper" />
69+
70+
<!-- System.Reflection.Emit.Lightweight -->
71+
<IgnoredTypes Include="System.Reflection.Emit.DynamicMethod" />
72+
73+
<!-- System.Threading.Tasks.Extensions -->
74+
<IgnoredTypes Include="System.Runtime.CompilerServices.AsyncMethodBuilderAttribute" />
75+
<IgnoredTypes Include="System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder" />
76+
<IgnoredTypes Include="System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder`1" />
77+
<IgnoredTypes Include="System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable" />
78+
<IgnoredTypes Include="System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable/ConfiguredValueTaskAwaiter" />
79+
<IgnoredTypes Include="System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1" />
80+
<IgnoredTypes Include="System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1/ConfiguredValueTaskAwaiter" />
81+
<IgnoredTypes Include="System.Runtime.CompilerServices.ValueTaskAwaiter" />
82+
<IgnoredTypes Include="System.Runtime.CompilerServices.ValueTaskAwaiter`1" />
83+
<IgnoredTypes Include="System.Threading.Tasks.Sources.IValueTaskSource" />
84+
<IgnoredTypes Include="System.Threading.Tasks.Sources.IValueTaskSource`1" />
85+
<IgnoredTypes Include="System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags" />
86+
<IgnoredTypes Include="System.Threading.Tasks.Sources.ValueTaskSourceStatus" />
87+
<IgnoredTypes Include="System.Threading.Tasks.ValueTask" />
88+
<IgnoredTypes Include="System.Threading.Tasks.ValueTask`1" />
89+
</ItemGroup>
90+
</Project>

0 commit comments

Comments
 (0)