Skip to content

Commit

Permalink
[mono] Update bundled SDKs from cli branch release/2.1.4xx (dotnet#83)
Browse files Browse the repository at this point in the history
cli commit: bcfed91

Microsoft.NET.Sdk:                      2.1.400
Microsoft.NET.Sdk.Razor:                2.1.1
Microsoft.NET.Sdk.Web                   2.1.400-preview1-20180705-1834985
Microsoft.NET.Sdk.Publish:              2.1.400-preview1-20180705-1834985
Microsoft.NET.Sdk.Web.ProjectSystem:    2.1.400-preview1-20180705-1834985

Microsoft.NET.Build.Extensions:         2.1.400

NuGet.Build.Tasks:                      4.8.1-rtm.5435
NuGet.Build.Tasks.Pack:                 4.8.1-rtm.5435

Also added nuget source: https://dotnet.myget.org/F/dotnet-web/api/v3/index.json
.. for `*Web*, and `*Publish*` SDKs.

Versions from:
https://github.com/dotnet/cli/blob/bcfed917f2c22b94d4e4dd67ca5f2588d72d0f76/build/DependencyVersions.props

(cherry picked from commit 12a54e1)
  • Loading branch information
radical authored Dec 14, 2018
1 parent c258604 commit 804bde7
Show file tree
Hide file tree
Showing 102 changed files with 1,305 additions and 325 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<NETBuildExtensionsError Condition="'$(DependsOnNETStandard)' == 'true' AND '$(NETStandardInbox)' != 'true' AND '$(_UsingOldSDK)' == 'true'"
ResourceName="UnsupportedSDKVersionForNetStandard20"/>

<!--
Just like references from packages, RAR should not waste time finding dependencies and related files for libraries added by this
extension. See related MarkPackageReferencesAsExternallyResolved in Microsoft.PackageDependencyResolution.targets.
-->
<PropertyGroup Condition="'$(MarkNETFrameworkExtensionAssembliesAsExternallyResolved)' == ''">
<MarkNETFrameworkExtensionAssembliesAsExternallyResolved>true</MarkNETFrameworkExtensionAssembliesAsExternallyResolved>
</PropertyGroup>

<!--
.NET 4.7.1 has support for .NET Standard 2.0 built-in, so most of the facades aren't necessary. However, the assembly versions of a few set of assemblies
do not yet match the ones shipped in the support package for .NET Standard 2.0 on .NET 4.7 and below. This means that .NET 4.7 or lower libraries might have
Expand Down Expand Up @@ -123,12 +115,31 @@ Copyright (c) .NET Foundation. All rights reserved.
<Reference Include="%(_NETStandardLibraryNETFrameworkLib.FileName)">
<HintPath>%(_NETStandardLibraryNETFrameworkLib.Identity)</HintPath>
<Private>false</Private>
<ExternallyResolved>$(MarkNETFrameworkExtensionAssembliesAsExternallyResolved)</ExternallyResolved>
</Reference>

<ReferenceCopyLocalPaths Include="@(_NETStandardLibraryNETFrameworkLib)" Condition="'%(FileName)' != 'netfx.force.conflicts'">
<Private>false</Private>
</ReferenceCopyLocalPaths>
</ItemGroup>
</Target>

<!-- There was issue in .NET 4.7.1 where System.IO.Compression.ZipFile was not correctly in the unification table.
A workaround to issues that caused was to add a binding redirect for the assembly from version 4.0.3.0 down to
4.0.0.0. However, with the fix to dotnet/sdk#2221, ResolveAssemblyReference now sees a conflicting version for
the assembly, and suggests a redirect to 4.0.3.0. With automatic binding redirection, this overrides the redirect
to 4.0.0.0, which causes a runtime failure.
So here we disable any suggested binding redirect for System.IO.Compression.ZipFile. Assemblies in the unification
table generally should not need binding redirects, so it should be OK to do this for 4.7.2 and forward, and on 4.7.1
the assembly isn't in the unification table so this allows the original workaround redirect to be preserved. -->
<Target Name="_RemoveZipFileSuggestedRedirect"
BeforeTargets="GenerateBindingRedirects"
DependsOnTargets="ResolveAssemblyReferences"
Condition="'$(_TargetFrameworkVersionWithoutV)' &gt;= '4.7.1' And '$(AllowZipFileRedirect)' != 'true'">
<ItemGroup>
<SuggestedBindingRedirects Remove="System.IO.Compression.ZipFile, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</ItemGroup>

</Target>

</Project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 9 additions & 9 deletions mono/build/SdkVersions.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
OldCLICommitHash=d36e5ce1619640f4516c1e89ef20cf52f1a32878;
NuGet.Build.Tasks.Pack=4.8.0-preview1.5196;
Microsoft.NET.Sdk=1.0.0-preview-62924-09;
Microsoft.NET.Sdk.Razor=2.1.0;
Microsoft.NET.Sdk.Web=2.1.300;
Microsoft.NET.Sdk.Publish=2.1.300;
Microsoft.NET.Sdk.Web.ProjectSystem=2.1.300;
OldCLICommitHash=bcfed917f2c22b94d4e4dd67ca5f2588d72d0f76;
NuGet.Build.Tasks.Pack=4.8.1-rtm.5435;
Microsoft.NET.Sdk=2.1.400;
Microsoft.NET.Sdk.Razor=2.1.1;
Microsoft.NET.Sdk.Web=2.1.400-preview1-20180705-1834985;
Microsoft.NET.Sdk.Publish=2.1.400-preview1-20180705-1834985;
Microsoft.NET.Sdk.Web.ProjectSystem=2.1.400-preview1-20180705-1834985;
FSharp.NET.Sdk=1.0.4-bundled-0100;
Microsoft.NET.Build.Extensions=1.0.0-preview-62924-09;
NuGet.Build.Tasks=4.8.0-preview1.5196;
Microsoft.NET.Build.Extensions=2.1.400;
NuGet.Build.Tasks=4.8.1-rtm.5435;
1 change: 1 addition & 0 deletions mono/build/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
<RestoreSources>$(RestoreSources);https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</RestoreSources>
<RestoreSources>$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
<RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/nuget-build/api/v3/index.json</RestoreSources>
<RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-web/api/v3/index.json</RestoreSources>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion nuget-support/nuget.build.tasks.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.8.0-preview1.5196
4.8.1-rtm.5435
Binary file modified nuget-support/tasks-targets/NuGet.Build.Tasks.dll
Binary file not shown.
7 changes: 6 additions & 1 deletion nuget-support/tasks-targets/NuGet.Build.Tasks.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Commands.dll
Binary file not shown.
29 changes: 24 additions & 5 deletions nuget-support/tasks-targets/NuGet.Commands.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Common.dll
Binary file not shown.
49 changes: 48 additions & 1 deletion nuget-support/tasks-targets/NuGet.Common.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Configuration.dll
Binary file not shown.
7 changes: 6 additions & 1 deletion nuget-support/tasks-targets/NuGet.Configuration.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Credentials.dll
Binary file not shown.
Binary file modified nuget-support/tasks-targets/NuGet.DependencyResolver.Core.dll
Binary file not shown.

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Frameworks.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion nuget-support/tasks-targets/NuGet.Frameworks.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.LibraryModel.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion nuget-support/tasks-targets/NuGet.LibraryModel.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Packaging.Core.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion nuget-support/tasks-targets/NuGet.Packaging.Core.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Packaging.dll
Binary file not shown.
Loading

0 comments on commit 804bde7

Please sign in to comment.