Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

[release/3.1.4xx] Update dependencies from dotnet/sdk #13353

Merged
dotnet-maestro merged 6 commits into from
May 19, 2020
Merged

[release/3.1.4xx] Update dependencies from dotnet/sdk #13353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5e51f3
Update dependencies from https://github.com/dotnet/sdk build 20200513.9
dotnet-maestro[bot] May 14, 2020
01fa0f4
Update stage 0
joeloff May 15, 2020
bb3d10b
Stage 0 update for LKG version
joeloff May 15, 2020
a140774
Bump MSBuild version to 16.7
rainersigwald May 15, 2020
e8277b8
Update NuGet clien version to 6609
joeloff May 18, 2020
ea951fd
Fix deployment of hostfxr for SDK Resolver
dsplaisted May 19, 2020
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
</Dependency>
</ToolsetDependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.400-preview.20263.1">
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.400-preview.20263.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b9874ceb1f1baae24c34436220ace0f1a073bdcf</Sha>
<Sha>f9bb37a4c1db7833e86cd6f86669c39680d4f7d4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
Expand All @@ -60,9 +60,9 @@
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.7.0-preview.1.6592">
<Dependency Name="NuGet.Build.Tasks" Version="5.7.0-preview.1.6609">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>4dbf16e68eabf507b9f156c801b1b7c3b0586e43</Sha>
<Sha>12a375a8a02764b772a20371abaf797639a7f961</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- Production Dependencies -->
<PropertyGroup>
<!-- "Stage 0" from https://github.com/dotnet/core-sdk -->
<DotNetCoreSdkLKGVersion>3.1.200-preview-014946</DotNetCoreSdkLKGVersion>
<DotNetCoreSdkLKGVersion>3.1.400-preview-015138</DotNetCoreSdkLKGVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
Expand All @@ -32,14 +32,14 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/microsoft/msbuild -->
<MicrosoftBuildPackageVersion>16.5.0-preview-20064-06</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>16.7.0-preview-20265-03</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>3.1.400-preview.20263.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.1.400-preview.20263.9</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -57,7 +57,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client-->
<NuGetBuildTasksPackageVersion>5.7.0-preview.1.6592</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>5.7.0-preview.1.6609</NuGetBuildTasksPackageVersion>
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.1.200-preview-014946",
"dotnet": "3.1.400-preview-015138",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppInternalPackageVersion)"
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<PublishDir>$(SdkResolverOutputDirectory)</PublishDir>
<IsPackable>true</IsPackable>
<!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
<EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>
</PropertyGroup>

<ItemGroup>
Expand Down