Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Commit 89dc20a

Browse files
radicalradical
authored
Merge pull request #142 from radical/update-3.1-master
[mono] Update SDK/nuget versions to track `release/3.1.1xx`
2 parents 5ef648c + a8658b1 commit 89dc20a

File tree

5 files changed

+59
-29
lines changed

5 files changed

+59
-29
lines changed

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,37 @@
1111
<Uri>https://github.com/dotnet/corefx</Uri>
1212
<Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
1313
</Dependency>
14+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-preview1.19463.2">
15+
<Uri>https://github.com/dotnet/sdk</Uri>
16+
<Sha>a19b734139ab62de631c31897b0ffc35f8462f3f</Sha>
17+
</Dependency>
18+
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.0-preview1.19470.1">
19+
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
20+
<Sha>f283e4a7c0d47054c9a178ff0b29f00e68f307d3</Sha>
21+
</Dependency>
22+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19461.2">
23+
<Uri>https://github.com/aspnet/websdk</Uri>
24+
<Sha>9471e9daf66b1e4f03d8b461c3ca0594f742923b</Sha>
25+
</Dependency>
26+
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.19380.1">
27+
<Uri>https://github.com/mono/linker</Uri>
28+
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
29+
</Dependency>
30+
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19467.7">
31+
<Uri>https://github.com/dotnet/core-setup</Uri>
32+
<Sha>1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2</Sha>
33+
</Dependency>
34+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.100-preview1.19467.5">
35+
<Uri>https://github.com/dotnet/cli</Uri>
36+
<Sha>11fe23d96c69dad32ab5267d63e572778c5d6de5</Sha>
37+
</Dependency>
38+
<Dependency Name="Microsoft.Net.Compilers" Version="3.3.1-beta3-19426-02">
39+
<Uri>https://github.com/dotnet/roslyn</Uri>
40+
<Sha>c82648d8964d1e683f92b7daa91beef2fdc5fb72</Sha>
41+
</Dependency>
42+
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6192">
43+
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
44+
<Sha>bb60d6720d24890b8f3e071e70d27ea0f2bef57e</Sha>
45+
</Dependency>
1446
</ProductDependencies>
1547
</Dependencies>

‎eng/Versions.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838
<!-- Product Dependencies -->
3939
<PropertyGroup>
4040
<SystemResourcesExtensionsVersion>4.6.0-rc2.19458.3</SystemResourcesExtensionsVersion>
41+
<MicrosoftNetCompilersVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersVersion>
42+
<MicrosoftNETSdkVersion>3.1.100-preview1.19463.2</MicrosoftNETSdkVersion>
43+
<MicrosoftNETSdkRazorVersion>3.1.0-preview1.19470.1</MicrosoftNETSdkRazorVersion>
44+
<MicrosoftNETSdkWebVersion>3.0.100-rc2.19461.2</MicrosoftNETSdkWebVersion>
45+
<NuGetBuildTasksVersion>5.3.0-rtm.6192</NuGetBuildTasksVersion>
46+
<ILLinkTasksVersion>0.1.6-prerelease.19380.1</ILLinkTasksVersion>
47+
<MicrosoftNETCoreAppVersion>3.1.0-preview1.19467.7</MicrosoftNETCoreAppVersion>
48+
<MicrosoftDotNetCliRuntimeVersion>3.1.100-preview1.19467.5</MicrosoftDotNetCliRuntimeVersion>
4149
</PropertyGroup>
4250
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
4351
<!-- See https://github.com/dotnet/arcade/issues/3386

‎mono/build/DotNetBitsVersions.props‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
11
<Project>
2+
<Import Project="..\..\eng\Versions.props" />
23
<PropertyGroup>
3-
<MicrosoftNETSdkPackageVersion>3.0.100-rc2.19463.5</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETBuildExtensionsVersion>$(MicrosoftNETSdkVersion)</MicrosoftNETBuildExtensionsVersion>
45

5-
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
6+
<MicrosoftNETSdkPublishVersion>$(MicrosoftNETSdkWebVersion)</MicrosoftNETSdkPublishVersion>
7+
<MicrosoftNETSdkWebProjectSystemVersion>$(MicrosoftNETSdkWebVersion)</MicrosoftNETSdkWebProjectSystemVersion>
8+
<NuGetBuildTasksPackVersion>$(NuGetBuildTasksVersion)</NuGetBuildTasksPackVersion>
69

7-
<MicrosoftNETSdkRazorPackageVersion>3.0.0</MicrosoftNETSdkRazorPackageVersion>
8-
9-
<MicrosoftNETSdkWebPackageVersion>3.0.100-rc2.19465.1</MicrosoftNETSdkWebPackageVersion>
10-
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
11-
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
12-
13-
<NuGetBuildTasksPackageVersion>5.3.0-rtm.6192</NuGetBuildTasksPackageVersion>
14-
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
15-
16-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc2.19465.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
17-
18-
<MicrosoftNETCoreAppPackageVersion>3.0.0</MicrosoftNETCoreAppPackageVersion>
19-
<DotNetSdkVersionForLibHostFxr>$(MicrosoftNETCoreAppPackageVersion)</DotNetSdkVersionForLibHostFxr>
20-
21-
<ILLinkTasksPackageVersion>0.1.6-prerelease.19380.1</ILLinkTasksPackageVersion>
10+
<MicrosoftDotNetMSBuildSdkResolverVersion>$(MicrosoftDotNetCliRuntimeVersion)</MicrosoftDotNetMSBuildSdkResolverVersion>
11+
<DotNetSdkVersionForLibHostFxr>$(MicrosoftNETCoreAppVersion)</DotNetSdkVersionForLibHostFxr>
2212
</PropertyGroup>
2313

2414
<ItemGroup>
25-
<BundledSdk Include="Microsoft.NET.Sdk" Version="$(MicrosoftNETSdkPackageVersion)" />
26-
<BundledSdk Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
27-
<BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(MicrosoftNETSdkWebPackageVersion)" />
28-
<BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(MicrosoftNETSdkPublishPackageVersion)" />
29-
<BundledSdk Include="Microsoft.NET.Sdk.Web.ProjectSystem" Version="$(MicrosoftNETSdkWebProjectSystemPackageVersion)" />
15+
<BundledSdk Include="Microsoft.NET.Sdk" Version="$(MicrosoftNETSdkVersion)" />
16+
<BundledSdk Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorVersion)" />
17+
<BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(MicrosoftNETSdkWebVersion)" />
18+
<BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(MicrosoftNETSdkPublishVersion)" />
19+
<BundledSdk Include="Microsoft.NET.Sdk.Web.ProjectSystem" Version="$(MicrosoftNETSdkWebProjectSystemVersion)" />
3020

31-
<BundledSdk Include="ILLink.Tasks" Version="$(ILLinkTasksPackageVersion)" />
21+
<BundledSdk Include="ILLink.Tasks" Version="$(ILLinkTasksVersion)" />
3222

33-
<BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackPackageVersion)" />
23+
<BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackVersion)" />
3424

3525
<BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
3626
<BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />

‎mono/build/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Update various SDKs that we bundle with mono.
22

3-
- Update the various versions in `mono/build/DotNetBitsVersions.props`.
3+
- Update the various versions in `eng/Versions.props`
44
- If any nuget sources need to be updated, then do that in `mono/build/RestoreSourcesOverrides.props`.
55

66
- For NuGet update, ensure that the version is updated in `eng/Packages.props`:

‎mono/build/sdks_and_nugets/update_sdks_and_nugets.proj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project DefaultTargets="DeploySdksAndNuGets">
22
<Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
33
<Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
44

@@ -15,7 +15,7 @@
1515

1616
<HostFxrUrl>$(CoreSetupRootUrl)$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</HostFxrUrl>
1717
<MSBuildSdkResolverOutDir>$(DotNetOverlayDirectory)\msbuild-bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver</MSBuildSdkResolverOutDir>
18-
<RuntimeDepsInstallerUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam)</RuntimeDepsInstallerUrl>
18+
<RuntimeDepsInstallerUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam)</RuntimeDepsInstallerUrl>
1919
</PropertyGroup>
2020

2121
<Target Name="DeploySdksAndNuGets">
@@ -38,7 +38,7 @@
3838
<Properties>
3939
ProjectWithProperties=ms_extensions.proj;
4040
DependencyPackageName=Microsoft.NET.Build.Extensions;
41-
DependencyPackageVersion=$(MicrosoftNETBuildExtensionsPackageVersion);
41+
DependencyPackageVersion=$(MicrosoftNETBuildExtensionsVersion);
4242
NuGetPackagesDir=$(NuGetPackagesDir);
4343
MSBuildExtensionsPathToolsVersionOutputDirectory=$(MSBuildExtensionsPathToolsVersionOutputDirectory);
4444
MSBuildExtensionsPathOutputDirectory=$(MSBuildExtensionsPathOutputDirectory)
@@ -49,7 +49,7 @@
4949
<Properties>
5050
ProjectWithProperties=dotnet_resolver.proj;
5151
DependencyPackageName=Microsoft.DotNet.MSBuildSdkResolver;
52-
DependencyPackageVersion=$(MicrosoftDotNetMSBuildSdkResolverPackageVersion);
52+
DependencyPackageVersion=$(MicrosoftDotNetMSBuildSdkResolverVersion);
5353
NuGetPackagesDir=$(NuGetPackagesDir);
5454
DotnetSdkResolverDir=$(MSBuildSdkResolverOutDir)
5555
</Properties>

0 commit comments

Comments
 (0)