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

Commit 8f608e4

Browse files
radicalradical
authored
Merge pull request #110 from radical/update-master
[mono] Update SDKs to track cli branch `release/2.1.8xx`
2 parents 687bade + 97ef228 commit 8f608e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+217
-156
lines changed

‎eng/Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MicrosoftNetCompilersVersion>3.1.0</MicrosoftNetCompilersVersion>
55
<CompilerToolsVersion>3.1.0</CompilerToolsVersion>
6-
<NuGetPackageVersion>5.1.0-rtm.5921</NuGetPackageVersion>
6+
<NuGetPackageVersion>5.2.0-preview2.6020</NuGetPackageVersion>
77
<NuGetBuildTasksVersion Condition="'$(NuGetBuildTasksVersion)' == ''">$(NuGetPackageVersion)</NuGetBuildTasksVersion>
88
<NuGetCommandsVersion Condition="'$(NuGetCommandsVersion)' == ''">$(NuGetPackageVersion)</NuGetCommandsVersion>
99
<NuGetProtocolVersion Condition="'$(NuGetProtocolVersion)' == ''">$(NuGetPackageVersion)</NuGetProtocolVersion>

‎mono/build/SdkVersions.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
OldCLICommitHash=a8e019bbb3fc6c99e80f1f37e8b13656d7aa1c05;
2-
NuGet.Build.Tasks.Pack=5.1.0-rtm.6013;
1+
OldCLICommitHash=fb813d5105119bcfd49f29065fb82ebb939ed902;
2+
NuGet.Build.Tasks.Pack=5.2.0-preview2.6020;
33
Microsoft.NET.Sdk=2.1.700-preview-64109-02;
44
Microsoft.NET.Sdk.Razor=2.1.1;
55
Microsoft.NET.Sdk.Web=2.1.500;
66
Microsoft.NET.Sdk.Publish=2.1.500;
77
Microsoft.NET.Sdk.Web.ProjectSystem=2.1.500;
88
FSharp.NET.Sdk=1.0.4-bundled-0100;
99
Microsoft.NET.Build.Extensions=2.1.700-preview-64109-02;
10-
NuGet.Build.Tasks=5.1.0-rtm.6013;
10+
NuGet.Build.Tasks=5.2.0-preview2.6020;
1111
SdkResolver=2.1.11;
1212
SdkResolverUrl=https://dotnetcli.azureedge.net/dotnet/Runtime/2.1.11/dotnet-hostfxr-internal-2.1.11-osx-x64.pkg;
1313
RuntimeDepsInstallerUrl=https://dotnetcli.azureedge.net/dotnet/Runtime/2.1.11/dotnet-runtime-deps-2.1.11-osx-x64.pkg;

‎mono/build/all_files.canon.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ lib/mono/msbuild/Current/bin/Microsoft.Common.overridetasks
3535
lib/mono/msbuild/Current/bin/Microsoft.Common.targets
3636
lib/mono/msbuild/Current/bin/Microsoft.Common.tasks
3737
lib/mono/msbuild/Current/bin/Microsoft.Data.Entity.targets
38+
lib/mono/msbuild/Current/bin/Microsoft.Managed.targets
3839
lib/mono/msbuild/Current/bin/Microsoft.NETFramework.CurrentVersion.props
3940
lib/mono/msbuild/Current/bin/Microsoft.NETFramework.CurrentVersion.targets
4041
lib/mono/msbuild/Current/bin/Microsoft.NETFramework.props

‎mono/build/remaining_files.canon.txt‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,83 @@ Directory.Build.rsp
33
Directory.Build.targets
44
MSBuild.Bootstrap.dll
55
MSBuild.Bootstrap.pdb
6+
Roslyn/cs/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
7+
Roslyn/cs/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
8+
Roslyn/cs/Microsoft.CodeAnalysis.CSharp.resources.dll
9+
Roslyn/cs/Microsoft.CodeAnalysis.Scripting.resources.dll
10+
Roslyn/cs/Microsoft.CodeAnalysis.VisualBasic.resources.dll
11+
Roslyn/cs/Microsoft.CodeAnalysis.resources.dll
12+
Roslyn/de/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
13+
Roslyn/de/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
14+
Roslyn/de/Microsoft.CodeAnalysis.CSharp.resources.dll
15+
Roslyn/de/Microsoft.CodeAnalysis.Scripting.resources.dll
16+
Roslyn/de/Microsoft.CodeAnalysis.VisualBasic.resources.dll
17+
Roslyn/de/Microsoft.CodeAnalysis.resources.dll
18+
Roslyn/es/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
19+
Roslyn/es/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
20+
Roslyn/es/Microsoft.CodeAnalysis.CSharp.resources.dll
21+
Roslyn/es/Microsoft.CodeAnalysis.Scripting.resources.dll
22+
Roslyn/es/Microsoft.CodeAnalysis.VisualBasic.resources.dll
23+
Roslyn/es/Microsoft.CodeAnalysis.resources.dll
24+
Roslyn/fr/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
25+
Roslyn/fr/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
26+
Roslyn/fr/Microsoft.CodeAnalysis.CSharp.resources.dll
27+
Roslyn/fr/Microsoft.CodeAnalysis.Scripting.resources.dll
28+
Roslyn/fr/Microsoft.CodeAnalysis.VisualBasic.resources.dll
29+
Roslyn/fr/Microsoft.CodeAnalysis.resources.dll
30+
Roslyn/it/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
31+
Roslyn/it/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
32+
Roslyn/it/Microsoft.CodeAnalysis.CSharp.resources.dll
33+
Roslyn/it/Microsoft.CodeAnalysis.Scripting.resources.dll
34+
Roslyn/it/Microsoft.CodeAnalysis.VisualBasic.resources.dll
35+
Roslyn/it/Microsoft.CodeAnalysis.resources.dll
36+
Roslyn/ja/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
37+
Roslyn/ja/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
38+
Roslyn/ja/Microsoft.CodeAnalysis.CSharp.resources.dll
39+
Roslyn/ja/Microsoft.CodeAnalysis.Scripting.resources.dll
40+
Roslyn/ja/Microsoft.CodeAnalysis.VisualBasic.resources.dll
41+
Roslyn/ja/Microsoft.CodeAnalysis.resources.dll
42+
Roslyn/ko/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
43+
Roslyn/ko/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
44+
Roslyn/ko/Microsoft.CodeAnalysis.CSharp.resources.dll
45+
Roslyn/ko/Microsoft.CodeAnalysis.Scripting.resources.dll
46+
Roslyn/ko/Microsoft.CodeAnalysis.VisualBasic.resources.dll
47+
Roslyn/ko/Microsoft.CodeAnalysis.resources.dll
48+
Roslyn/pl/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
49+
Roslyn/pl/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
50+
Roslyn/pl/Microsoft.CodeAnalysis.CSharp.resources.dll
51+
Roslyn/pl/Microsoft.CodeAnalysis.Scripting.resources.dll
52+
Roslyn/pl/Microsoft.CodeAnalysis.VisualBasic.resources.dll
53+
Roslyn/pl/Microsoft.CodeAnalysis.resources.dll
54+
Roslyn/pt-BR/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
55+
Roslyn/pt-BR/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
56+
Roslyn/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll
57+
Roslyn/pt-BR/Microsoft.CodeAnalysis.Scripting.resources.dll
58+
Roslyn/pt-BR/Microsoft.CodeAnalysis.VisualBasic.resources.dll
59+
Roslyn/pt-BR/Microsoft.CodeAnalysis.resources.dll
60+
Roslyn/ru/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
61+
Roslyn/ru/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
62+
Roslyn/ru/Microsoft.CodeAnalysis.CSharp.resources.dll
63+
Roslyn/ru/Microsoft.CodeAnalysis.Scripting.resources.dll
64+
Roslyn/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll
65+
Roslyn/ru/Microsoft.CodeAnalysis.resources.dll
66+
Roslyn/tr/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
67+
Roslyn/tr/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
68+
Roslyn/tr/Microsoft.CodeAnalysis.CSharp.resources.dll
69+
Roslyn/tr/Microsoft.CodeAnalysis.Scripting.resources.dll
70+
Roslyn/tr/Microsoft.CodeAnalysis.VisualBasic.resources.dll
71+
Roslyn/tr/Microsoft.CodeAnalysis.resources.dll
72+
Roslyn/zh-Hans/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
73+
Roslyn/zh-Hans/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
74+
Roslyn/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll
75+
Roslyn/zh-Hans/Microsoft.CodeAnalysis.Scripting.resources.dll
76+
Roslyn/zh-Hans/Microsoft.CodeAnalysis.VisualBasic.resources.dll
77+
Roslyn/zh-Hans/Microsoft.CodeAnalysis.resources.dll
78+
Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
79+
Roslyn/zh-Hant/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
80+
Roslyn/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll
81+
Roslyn/zh-Hant/Microsoft.CodeAnalysis.Scripting.resources.dll
82+
Roslyn/zh-Hant/Microsoft.CodeAnalysis.VisualBasic.resources.dll
83+
Roslyn/zh-Hant/Microsoft.CodeAnalysis.resources.dll
684
System.Reflection.Metadata.dll
85+
ref/MSBuild.Bootstrap.dll

‎nuget-support/nuget.build.tasks.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.0-rtm.6013
1+
5.2.0-preview2.6020

‎nuget-support/tasks-targets/NuGet.Build.Tasks.dll‎

208 Bytes
Binary file not shown.

‎nuget-support/tasks-targets/NuGet.Build.Tasks.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nuget-support/tasks-targets/NuGet.Commands.dll‎

512 Bytes
Binary file not shown.

‎nuget-support/tasks-targets/NuGet.Commands.xml‎

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nuget-support/tasks-targets/NuGet.Common.dll‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)