Skip to content

[release/3.0] Update dependencies from dotnet/core-sdk #1238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crummel merged 35 commits into from
Sep 26, 2019
Merged

[release/3.0] Update dependencies from dotnet/core-sdk #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c938e14
Update dependencies from https://github.com/dotnet/core-sdk build 201…
dotnet-maestro[bot] Sep 19, 2019
01abd0f
Remove sources that aren't working for us
crummel Sep 19, 2019
f132e5e
Update patches
crummel Sep 19, 2019
35d3df8
Fix patch
crummel Sep 19, 2019
5178e61
System.Resources.Extensions comes from CoreFX and MSBuild needs that.
crummel Sep 19, 2019
640345a
Merge branch 'release/3.0' of work:dotnet/source-build into darc-rele…
crummel Sep 23, 2019
008f4bb
Bring in Arcade change CoreFX needs
crummel Sep 23, 2019
92118c0
Fix patch
crummel Sep 23, 2019
2e8acbd
Templating needs both shipping and nonshipping packages
crummel Sep 23, 2019
afec2bc
Patch CLI property version name
crummel Sep 24, 2019
e64d98b
Patch core-sdk to fix not including Windows templates
crummel Sep 24, 2019
b5d17c0
Bigger hammer for Windows templates
crummel Sep 24, 2019
31299f0
Fix templating version
crummel Sep 24, 2019
e4c4095
More RestoreSources for CLI
crummel Sep 24, 2019
3466144
Stable versions for core-setup and core-sdk only
crummel Sep 24, 2019
b419241
Revert "Stable versions for core-setup and core-sdk only"
crummel Sep 24, 2019
4dd10c9
A couple more stabilization variables
crummel Sep 24, 2019
f2aa2c6
Don't use stable versions for our tooling packages
crummel Sep 25, 2019
894cf37
Patch CoreFX with new package baseline
crummel Sep 25, 2019
c41461e
Don't think we need this one
crummel Sep 25, 2019
f00b13e
Different approach
crummel Sep 25, 2019
efd0939
CoreCLR needs it too?
crummel Sep 25, 2019
bfa065e
Don't think we need these
crummel Sep 25, 2019
ae20c0b
Add another Arcade commit we need
crummel Sep 25, 2019
4f24423
More arcade packaging patches
crummel Sep 25, 2019
1661a75
Patch toolset to remove WindowsDesktop dependency
crummel Sep 25, 2019
6b22725
workaround for RID being included in version regex
crummel Sep 25, 2019
8ccb1f2
Patch where core-sdk looks for ASP.NET
crummel Sep 25, 2019
1093562
Use packaging SDK in core-setup
crummel Sep 25, 2019
f0d849c
Update prebuilt baselines
crummel Sep 25, 2019
b42dd7a
Patch MSBuild to not try to call dotnet with no path
crummel Sep 26, 2019
425a7be
Patch ASP.NET to not call out to dotnet without a path
crummel Sep 26, 2019
a6e38fb
Same patch for templating
crummel Sep 26, 2019
1f2f3b4
More of the same
crummel Sep 26, 2019
c809899
Fix ASP.NET version number
crummel Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PortableBuild Condition="'$(OS)' == 'Windows_NT'">true</PortableBuild>
<PortableBuild Condition="'$(PortableBuild)' == ''">false</PortableBuild>
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == '' AND '$(PortableBuild)' != 'true'">true</UseSystemLibraries>
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
<UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
</PropertyGroup>

<PropertyGroup>
Expand Down
70 changes: 35 additions & 35 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,52 +27,52 @@
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc1.19455.6" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc2.19462.5" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>aed84886b8d777168f53fae4da15c7af5f7572da</Sha>
<Sha>922429db0144dd6f3b4324805464dae82857512a</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19455.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>209c43e7f6232e7871b6927a510c25ee7dfd5c72</Sha>
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc1.19456.4" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19462.14" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>3da667af759d88b683ca851694ced073e8dc9960</Sha>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19456-20" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc2-19463-05" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>8f5d7b1ba4f744199ba006cac38dfcb9a2408880</Sha>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-rc1.19457.3" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
<Sha>d8f651aa5281e9fa60a8fe0dcad98efeb7720a36</Sha>
<Sha>16b0ca4a5838c39c8852e6cf144232597e2bee2e</Sha>
<RepoName>aspnetcore-tooling</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-rc1.19473.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
<Sha>b2663fb07294f5d6cf3caa927d58f7cbebf7d626</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.1-beta3-19454-05" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.1-beta4-19462-11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3b423bd305daf81076d4d7b105101361c2490531</Sha>
<Sha>66a912c9463eebe832cf742d2fe8bb2e1a4600ec</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.3.0-preview-19455-02" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/Microsoft/msbuild</Uri>
<Sha>4a2d771074b97bcc31125801b4a9ea57900d84d6</Sha>
<Dependency Name="Microsoft.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/microsoft/msbuild</Uri>
<Sha>0f4c62feac0a5726f63b56472de7b1c1527459fc</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6192" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6251" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>bb60d6720d24890b8f3e071e70d27ea0f2bef57e</Sha>
<Sha>b75150f2f4127a77a166c9552845e86fb24a3282</Sha>
<RepoName>nuget-client</RepoName>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-rc1.19456.10" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>73c259904d5db01bbeede15df2a72d1b94cb3306</Sha>
<Sha>0b951c16de0f39e13cce8372e11c28eb90576662</Sha>
<RepoName>aspnet-extensions</RepoName>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19458.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc2.19467.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b09faf073550a3bf31f3be23ad0b2b7b4d80f4d5</Sha>
<Sha>b3a343bf8ed65f5208c5bb86c632856c5d107b1d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
<Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
Expand All @@ -89,34 +89,34 @@
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc1.19457.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
<RepoName>aspnetcore</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc1.19458.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc2.19467.7" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>70cf7521b833e92afe13864c775399a2e6922176</Sha>
<Sha>e72d84f73adcbfa0054df27fbb21505295a55dcb</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.6.0-beta.19454.10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>0422ff293bb2cc722fe5021b85ef50378a9af823</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc1.19458.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19465.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/aspnet/websdk</Uri>
<Sha>0141a0efbdad0ece12294cec1f6da1c03502e021</Sha>
<Sha>002ea5ca7c699d925281abd8307556ec8eccb530</Sha>
</Dependency>
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0-preview-20190905-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>2479b26734a98a9594590ee13e895aa58b5f0a6b</Sha>
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19458.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc2.19468.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>8d4c190fe5f865f9f900ac3a94a9e5b5029cdc03</Sha>
<Sha>33026f95de81116aefd79b4ec4c8071090a02480</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19458.23">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19468.4">
<Uri>https://github.com/dotnet/core-sdk</Uri>
<Sha>c4d43f672d8c1bca944a2177d517223028629f54</Sha>
<Sha>04339c3a262a2e313f9431edd3805ce71e08b92e</Sha>
</Dependency>
<!-- external dependencies, not handled by Maestro/Arcade -->
<Dependency Name="Newtonsoft.Json" Version="12.0.2">
Expand Down
6 changes: 3 additions & 3 deletions ...e-dependencies-for-CoreFX-partial-p.patch → ...e-dependencies-for-CoreFX-partial-p.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b85de43a04b54a267ac4fa8dd70047b35e482676 Mon Sep 17 00:00:00 2001
From 64a346d373e2cf6c99182fdd4a8e6a77e4866fd1 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Thu, 29 Aug 2019 11:20:06 -0500
Subject: [PATCH 2/2] Remove adding fake dependencies for CoreFX partial
Subject: [PATCH 3/4] Remove adding fake dependencies for CoreFX partial
packages.

---
Expand All @@ -27,5 +27,5 @@ index a3a0bd85..06d45eff 100644

<!-- Generate package references based on assembly dependencies -->
--
2.18.0
2.21.0

Loading