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

[master] Update dependencies from dotnet/sdk #11166

Merged
dotnet-maestro merged 6 commits into from
Apr 18, 2019
Merged

[master] Update dependencies from dotnet/sdk #11166

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
ceec751
Update dependencies from https://github.com/dotnet/sdk build 20190415.3
Apr 16, 2019
93b772d
Update stage 0
dsplaisted Apr 17, 2019
2912d6b
Insert updated NuGet
dsplaisted Apr 17, 2019
9a56d1e
Update dependencies from https://github.com/dotnet/sdk build 20190417.12
Apr 18, 2019
bc67bf9
Update dependencies from https://github.com/dotnet/sdk build 20190418.1
Apr 18, 2019
9bd0961
Update tests for maximum CLI tools version
dsplaisted Apr 18, 2019
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</Dependency>
</ToolsetDependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview5.19214.1">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview5.19218.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>fe57a1c3888750e1656da45d36235b14d6c5aa28</Sha>
<Sha>4a9967e05bd22bda454598b0dbdfc7cd4ed0dd2d</Sha>
</Dependency>
<!-- We don't want migrate being updated by DARC just yet due to the NuGet
discrepancy between it and the CLI. We will fix that for P3 -->
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
</PropertyGroup>
<!-- Production Dependencies -->
<PropertyGroup>
<DotNetCoreSdkLKGVersion>3.0.100-preview4-010615</DotNetCoreSdkLKGVersion>
<DotNetCoreSdkLKGVersion>3.0.100-preview5-011317</DotNetCoreSdkLKGVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>2.2.0</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>2.2.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftApplicationInsightsPackageVersion>2.0.0</MicrosoftApplicationInsightsPackageVersion>
<MicrosoftBuildPackageVersion>16.1.0-preview.19</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-preview5.19214.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-preview5.19218.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>3.0.0-alpha1-10062</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftTemplateEngineCliPackageVersion>1.0.2-beta5.19214.1</MicrosoftTemplateEngineCliPackageVersion>
Expand All @@ -34,7 +34,7 @@
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.2-preview.19074.1</MicrosoftDotNetProjectJsonMigrationPackageVersion>
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
<NewtonsoftJsonPackageVersion>10.0.3</NewtonsoftJsonPackageVersion>
<NuGetBuildTasksPackageVersion>5.0.0-rtm.5821</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>5.1.0-rtm.5921</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.0.100-preview4-010615"
"dotnet": "3.0.100-preview5-011317"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19214.2"
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.DotNet.CommandFactory.Tests/GivenAProjectToolsCommandResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Tests
public class GivenAProjectToolsCommandResolver : TestBase
{
private static readonly NuGetFramework s_toolPackageFramework =
NuGetFrameworks.NetCoreApp30;
NuGetFrameworks.NetCoreApp22;

private const string TestProjectName = "AppWithToolDependency";

Expand Down