Skip to content

Commit

Permalink
Update Arcade and other tool packages (#1237)
Browse files Browse the repository at this point in the history
* Update Arcade

* Update patches

* Update source built artifacts version to 3.0 release version

* Update dependencies from https://github.com/dotnet/core-sdk build 20191008.2

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19508.2

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19508.1 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.0.100-rc2.19507.2 (parent: Microsoft.Dotnet.Toolset.Internal)
  • Loading branch information
crummel authored Oct 17, 2019
1 parent fa288c0 commit 230872d
Show file tree
Hide file tree
Showing 57 changed files with 934 additions and 2,381 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ config.ps1
### source-build ###
prebuilt/
msbuild.binlog
testing-smoke/

# Exists temporarily during build. Interferes with VersionTools'
# UpdateDependenciesAndSubmitPullRequest: if no upgrades are performed, the
Expand Down
3 changes: 1 addition & 2 deletions .vsts.pipelines/steps/setup-macos-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ steps:
brew install icu4c openssl
brew link --force icu4c
# Follow https://github.com/dotnet/corefx/blob/master/Documentation/building/unix-instructions.md#user-content-macos
brew install pkgconfig openssl
brew upgrade cmake
brew install pkgconfig openssl cmake
brew_openssl_paths=$(brew info openssl | cut -d ' ' -f 1 | grep '^/.*/openssl/')
# Use 'for' to get last/latest openssl install dir.
for openssl_path in $brew_openssl_paths; do :; done
Expand Down
1 change: 0 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-microsoft-msbuild-0f4c62f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-0f4c62fe-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-b2663fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b2663fb0/nuget/v3/index.json" />
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
<add key="darc-pub-aspnet-Extensions-0b951c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-0b951c16/nuget/v3/index.json" />
<add key="darc-pub-aspnet-AspNetCore-Tooling-16b0ca4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-16b0ca4a/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion ProdConFeed.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dotnetfeed.blob.core.windows.net/dotnet-core-3-preview2/index.json
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
6 changes: 6 additions & 0 deletions build-source-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,12 @@ done
echo 'Copying source-built packages to tarball to replace packages needed before they are built...'
mkdir -p $TARBALL_ROOT/packages/source-built
cp -r $SCRIPT_ROOT/Tools/source-built/coreclr-tools $TARBALL_ROOT/packages/source-built/
cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*Arcade*.nupkg $TARBALL_ROOT/packages/source-built/
cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*SourceLink*.nupkg $TARBALL_ROOT/packages/source-built/
cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*Build*Tasks*.nupkg $TARBALL_ROOT/packages/source-built/
cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/runtime*.nupkg $TARBALL_ROOT/packages/source-built/
cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*DotNetHost*.nupkg $TARBALL_ROOT/packages/source-built/
cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*DotNetAppHost*.nupkg $TARBALL_ROOT/packages/source-built/

# Setup package version props to include both source-built and running PackageVersions.props
mkdir --parents $TARBALL_ROOT/bin/obj/x64/Release/
Expand Down
1 change: 1 addition & 0 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
<ItemGroup>
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Runtime.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/netstandard.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)netstandard.library/**/*.dll" />
<!-- Microsoft.AspNet.App DLLs that include .resource files -->
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Antiforgery.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authentication.OAuth.dll" />
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ if [ "$alternateTarget" == "true" ]; then

"$CLIPATH/dotnet" $SDKPATH/MSBuild.dll "$scriptroot/build.proj" /bl:source-build-test.binlog /flp:v=diag /clp:v=m "$@"
else
"$scriptroot/eng/common/build.sh" --restore --build -c Release --warnaserror false $@ /p:Projects="$scriptroot/build.proj"
"$scriptroot/eng/common/build.sh" --restore --build -c Release --warnaserror false -bl /flp:v=diag $@ /p:Projects="$scriptroot/build.proj"
fi
18 changes: 16 additions & 2 deletions dir.props
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)' == ''">true</UseStableVersions>
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -181,10 +181,24 @@
<Import Project="$(ProductionAllRepoPropsFile)" Condition="Exists('$(ProductionAllRepoPropsFile)')" />
<Import Project="$(OfflineAllRepoPropsFile)" Condition="Exists('$(OfflineAllRepoPropsFile)')" />

<!-- Arcade uses this property to determine which version of SourceLink to pull in -->
<!-- Additional psuedo-versions that some repos depend on -->
<ItemGroup>
<!-- Arcade uses this property to determine which version of SourceLink to pull in -->
<ExtraPackageVersionPropsPackageInfo Condition="'$(OfflineBuild)' != 'true'" Include="MicrosoftSourceLinkVersion" Version="%24(MicrosoftSourceLinkCommonPackageVersion)" />
<ExtraPackageVersionPropsPackageInfo Condition="'$(OfflineBuild)' == 'true'" Include="MicrosoftSourceLinkVersion" Version="$(sourcelinkOutputPackageVersion)" />
<!-- we don't produce the Windows version of this package but that's the one core-sdk keys off of for the ASP.NET version -->
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimewinx64PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
<!-- same thing here for CLI -->
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64Version" Version="$(coresetupOutputPackageVersion)" />
<!-- same thing here for toolset -->
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="$(coresetupOutputPackageVersion)" />
<!-- same thing here for core-sdk -->
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreAppVersion)" />
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreAppVersion)" />
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinuxX64PackageVersion)" />
<!-- OSX needs the OSX version instead of Linux. We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing. -->
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
</ItemGroup>

</Project>
44 changes: 22 additions & 22 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19381.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19463.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8f3c22397990aeb20a88690b51dad4b33f21e7ff</Sha>
<Sha>ce459ae07c3d7a1e68251268855e0bc7b3d97f75</Sha>
</Dependency>
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.19514.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>acd7da673fe41f51f0bc517c30271ff467885099</Sha>
</Dependency>
</ToolsetDependencies>
<ProductDependencies>
<Dependency Name="sourcelink" Version="1.0.0-beta2-19351-01">
<Dependency Name="Microsoft.Build.Tasks.Git" Version="1.0.0-beta2-19367-01">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>51310e65e75010467993f793e1739d1a1dad50c5</Sha>
<Sha>855afb5af9ea79e63dd9c051a7cfe0941bbb5ced</Sha>
</Dependency>
<!-- this is pinned to work around https://github.com/dotnet/arcade/issues/3518 -->
<!-- if XDT is updated before that issue is fixed, this should be updated. After the issue is fixed, it should be unpinned. -->
Expand All @@ -27,30 +27,30 @@
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc2.19462.5" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.1-servicing.19475.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>922429db0144dd6f3b4324805464dae82857512a</Sha>
<Sha>68ff240063fc2ddb9b03275ae5d5063a09d38ace</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19462.14" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-servicing.19501.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
<Sha>54d63c3e283e0c3937a35ab4e99f391c84ff119e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc2-19463-05" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.1-servicing-19502-09" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
</Dependency>
<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>16b0ca4a5838c39c8852e6cf144232597e2bee2e</Sha>
<RepoName>aspnetcore-tooling</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.1-servicing.19476.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>b2663fb07294f5d6cf3caa927d58f7cbebf7d626</Sha>
<Sha>a776e417c83c52908298b3767e462feae8b18b98</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.1-beta4-19462-11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand All @@ -70,9 +70,9 @@
<Sha>0b951c16de0f39e13cce8372e11c28eb90576662</Sha>
<RepoName>aspnet-extensions</RepoName>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc2.19467.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.101-servicing.19477.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b3a343bf8ed65f5208c5bb86c632856c5d107b1d</Sha>
<Sha>3819a21a612cd8bc15b6f6c4e361d18490469577</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 @@ -94,29 +94,29 @@
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
<RepoName>aspnetcore</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc2.19467.7" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.101-servicing.19503.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>e72d84f73adcbfa0054df27fbb21505295a55dcb</Sha>
<Sha>2bb5a58198c6d96aae157ea3a119867b57cd839d</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-rc2.19465.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19507.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/aspnet/websdk</Uri>
<Sha>002ea5ca7c699d925281abd8307556ec8eccb530</Sha>
<Sha>9b65fe8b178d2ad73482080c6a0aabae911e1224</Sha>
</Dependency>
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc2.19468.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19508.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>33026f95de81116aefd79b4ec4c8071090a02480</Sha>
<Sha>6a8609fc2c10ee908977238e5c6bc48b926491da</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19468.4">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19508.2">
<Uri>https://github.com/dotnet/core-sdk</Uri>
<Sha>04339c3a262a2e313f9431edd3805ce71e08b92e</Sha>
<Sha>f08e8bc516c2d598c8b0fba247bf8eac5e329a91</Sha>
</Dependency>
<!-- external dependencies, not handled by Maestro/Arcade -->
<Dependency Name="Newtonsoft.Json" Version="12.0.2">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<!-- Production Dependencies -->
<PropertyGroup>
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.19514.1</PrivateSourceBuildReferencePackagesPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-dev.19467.1</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.0.100</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.0.100-preview7-012821"
"dotnet": "3.0.100"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
Expand Down
6 changes: 3 additions & 3 deletions patches/arcade/0001-Enable-sourcelink-in-sourcebuild.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c255c95b8b488d81349ccecd47f1966e4aa9b713 Mon Sep 17 00:00:00 2001
From 203f9d3b13a9c30442159361d9333ae6144346c7 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Wed, 7 Aug 2019 19:23:07 -0500
Subject: [PATCH] Enable sourcelink in sourcebuild.
Subject: [PATCH 1/3] Enable sourcelink in sourcebuild.

---
.../tools/RepositoryInfo.targets | 14 +-------------
Expand Down Expand Up @@ -37,5 +37,5 @@ index 550ad298..8d31d833 100644
<SourceRoot Include="$(RepoRoot)" />
</ItemGroup>
--
2.21.0
2.18.0

Loading

0 comments on commit 230872d

Please sign in to comment.