mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214)

Browse source 
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5

* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.

* add a nuget dependency so migrated project has packageref and generates an assets file on restore
This commit is contained in:
Rohit Agrawal 2017-01-06 16:28:04 -08:00 • committed by GitHub
parent 5044c76be4
commit 5bbfbfeeed
11 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json
View file

@ -4,7 +4,9 @@
"debugType": "portable", "debugType": "portable",
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": {}, "dependencies": {
"Newtonsoft.Json": "9.0.1"
},
"frameworks": { "frameworks": {
"net451": {} "net451": {}
}, },

2
TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
View file

@ -24,7 +24,7 @@
<Version>1.0.3</Version> <Version>1.0.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Frameworks"> <PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.DotNet.Cli.Utils"> <PackageReference Include="Microsoft.DotNet.Cli.Utils">
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>

2
build/Microsoft.DotNet.Cli.BundledSdks.props
View file

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup> <ItemGroup>
<BundledSdk Include="NuGet.Build.Tasks.Pack" Version="4.0.0-rc2" /> <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="4.0.0-rc3" />
<BundledSdk Include="Microsoft.NET.Sdk" Version="$(CLI_NETSDK_Version)" /> <BundledSdk Include="Microsoft.NET.Sdk" Version="$(CLI_NETSDK_Version)" />
<BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(CLI_WEBSDK_Version)" /> <BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(CLI_WEBSDK_Version)" />
<BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(CLI_WEBSDK_Version)" /> <BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(CLI_WEBSDK_Version)" />

2
build/Microsoft.DotNet.Cli.DependencyVersions.props
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<CLI_MSBuild_Version>15.1.0-preview-000503-01</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.1.0-preview-000503-01</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc3-61212-03</CLI_Roslyn_Version> <CLI_Roslyn_Version>2.0.0-rc3-61212-03</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170105-1</CLI_NETSDK_Version> <CLI_NETSDK_Version>1.0.0-alpha-20170105-5</CLI_NETSDK_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170106-1-203</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-alpha-20170106-1-203</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20161227-02</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.0.0-preview-20161227-02</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170106-79</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta1-20170106-79</TemplateEngineVersion>

12
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup> <PropertyGroup>
<Description>Build scripts for dotnet-cli</Description> <Description>Build scripts for dotnet-cli</Description>
<VersionPrefix>1.0.0</VersionPrefix> <VersionPrefix>1.0.0</VersionPrefix>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks> <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\$(Configuration)</OutputPath> <OutputPath>bin\$(Configuration)</OutputPath>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\shared-build-targets-utils\shared-build-targets-utils.csproj" /> <ProjectReference Include="..\shared-build-targets-utils\shared-build-targets-utils.csproj" />
@ -42,11 +41,16 @@
<Version>7.2.1</Version> <Version>7.2.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.CommandLine.XPlat"> <PackageReference Include="NuGet.CommandLine.XPlat">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core"> <PackageReference Include="Microsoft.Build.Utilities.Core">
<Version>$(CLI_MSBuild_Version)</Version> <Version>$(CLI_MSBuild_Version)</Version>
</PackageReference> </PackageReference>
<!-- This dependency was added due to an issue in restore where a lower version of this package coming from nuget.commandline.xplat
led to an error. This is tracked as NuGet issue : https://github.com/NuGet/Home/issues/4213 -->
<PackageReference Include="Microsoft.Build.Framework">
<Version>$(CLI_MSBuild_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions"> <PackageReference Include="Microsoft.DotNet.PlatformAbstractions">
<Version>1.0.1-beta-000933</Version> <Version>1.0.1-beta-000933</Version>
</PackageReference> </PackageReference>

8
src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
View file

@ -18,16 +18,16 @@
<Version>1.0.1-beta-000933</Version> <Version>1.0.1-beta-000933</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Versioning"> <PackageReference Include="NuGet.Versioning">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Packaging"> <PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Frameworks"> <PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.ProjectModel"> <PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Build"> <PackageReference Include="Microsoft.Build">
<Version>$(CLI_MSBuild_Version)</Version> <Version>$(CLI_MSBuild_Version)</Version>

2
src/redist/redist.csproj
View file

@ -15,7 +15,7 @@
<Version>$(CLI_MSBuild_Version)</Version> <Version>$(CLI_MSBuild_Version)</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Build.Tasks"> <PackageReference Include="NuGet.Build.Tasks">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.TestPlatform.CLI"> <PackageReference Include="Microsoft.TestPlatform.CLI">
<Version>$(CLI_TestPlatform_Version)</Version> <Version>$(CLI_TestPlatform_Version)</Version>

2
src/tool_nuget/tool_nuget.csproj
View file

@ -10,7 +10,7 @@
<Version>1.0.3</Version> <Version>1.0.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.CommandLine.XPlat"> <PackageReference Include="NuGet.CommandLine.XPlat">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

8
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
View file

@ -57,16 +57,16 @@
<Version>4.1.1</Version> <Version>4.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Versioning"> <PackageReference Include="NuGet.Versioning">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Packaging"> <PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Frameworks"> <PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.ProjectModel"> <PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc2</Version> <Version>4.0.0-rc3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="moq.netcore"> <PackageReference Include="moq.netcore">
<Version>4.4.0-beta8</Version> <Version>4.4.0-beta8</Version>

7
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs
View file

@ -8,21 +8,20 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public sealed class RestoreProjectJsonCommand : TestCommand public sealed class RestoreProjectJsonCommand : TestCommand
{ {
public RestoreProjectJsonCommand() public RestoreProjectJsonCommand()
: base("dotnet") : base(new RepoDirectoriesProvider().PjDotnet)
{ {
} }
public override CommandResult Execute(string args="") public override CommandResult Execute(string args="")
{ {
args = $"restore-projectjson {args}"; args = $"restore {args}";
return base.Execute(args); return base.Execute(args);
} }
public override CommandResult ExecuteWithCapturedOutput(string args = "") public override CommandResult ExecuteWithCapturedOutput(string args = "")
{ {
args = $"restore-projectjson {args}"; args = $"restore {args}";
return base.ExecuteWithCapturedOutput(args); return base.ExecuteWithCapturedOutput(args);
} }
} }

6
test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs
View file

@ -681,9 +681,9 @@ namespace Microsoft.DotNet.Migration.Tests
private void RestoreProjectJson(string projectDirectory) private void RestoreProjectJson(string projectDirectory)
{ {
new TestCommand("dotnet") var projectFile = "\"" + Path.Combine(projectDirectory, "project.json") + "\"";
.WithWorkingDirectory(projectDirectory) new RestoreProjectJsonCommand()
.Execute("restore-projectjson") .Execute(projectFile)
.Should().Pass(); .Should().Pass();
} }