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

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

Merged
merged 6 commits into from
Jan 7, 2017
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa6761b
update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5
Jan 5, 2017
c10ba0f
Merge branch 'rel/1.0.0' into ragrawal/updatenugetrc3
Jan 5, 2017
06a241e
Merge branch 'rel/1.0.0' into ragrawal/updatenugetrc3
Jan 5, 2017
90c1171
Modifying restore project.json to use the project.json stage0 CLI ins…
livarcocc Jan 6, 2017
fadf7c4
add a nuget dependency so migrated project has packageref and generat…
Jan 6, 2017
0fc9222
Merge branch 'rel/1.0.0' into ragrawal/updatenugetrc3
Jan 6, 2017
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: 3 additions & 1 deletion TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"debugType": "portable",
"emitEntryPoint": true
},
"dependencies": {},
"dependencies": {

This comment was marked as spam.

Sign in to view

"Newtonsoft.Json": "9.0.1"
},
"frameworks": {
"net451": {}
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Version>1.0.3</Version>
</PackageReference>
<PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.Cli.Utils">
<Version>$(SdkNugetVersion)</Version>
Expand Down
2 changes: 1 addition & 1 deletion build/Microsoft.DotNet.Cli.BundledSdks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<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.Web" Version="$(CLI_WEBSDK_Version)" />
<BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(CLI_WEBSDK_Version)" />
Expand Down
2 changes: 1 addition & 1 deletion build/Microsoft.DotNet.Cli.DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_NETSDK_Version>1.0.0-alpha-20170105-5</CLI_NETSDK_Version>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

<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_NETSDK_Version>1.0.0-alpha-20170105-1</CLI_NETSDK_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170104-1-189</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20161227-02</CLI_TestPlatform_Version>
</PropertyGroup>
Expand Down
12 changes: 8 additions & 4 deletions build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />

<PropertyGroup>
<Description>Build scripts for dotnet-cli</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<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>
<ItemGroup>
<Compile Include="**\*.cs" />
Expand Down Expand Up @@ -45,11 +44,16 @@
<Version>7.2.1</Version>
</PackageReference>
<PackageReference Include="NuGet.CommandLine.XPlat">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core">
<Version>$(CLI_MSBuild_Version)</Version>
</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">

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

<Version>$(CLI_MSBuild_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions">
<Version>1.0.1-beta-000933</Version>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
<Version>1.0.1-beta-000933</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build">
<Version>$(CLI_MSBuild_Version)</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/redist/redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Version>$(CLI_MSBuild_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="Microsoft.TestPlatform.CLI">
<Version>$(CLI_TestPlatform_Version)</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/tool_nuget/tool_nuget.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Version>1.0.3</Version>
</PackageReference>
<PackageReference Include="NuGet.CommandLine.XPlat">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@
<Version>4.1.1</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc2</Version>
<Version>4.0.0-rc3</Version>
</PackageReference>
<PackageReference Include="moq.netcore">
<Version>4.4.0-beta8</Version>
Expand Down
7 changes: 3 additions & 4 deletions test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public sealed class RestoreProjectJsonCommand : TestCommand
{
public RestoreProjectJsonCommand()
: base("dotnet")
: base(new RepoDirectoriesProvider().PjDotnet)
{

}

public override CommandResult Execute(string args="")
{
args = $"restore-projectjson {args}";
args = $"restore {args}";

return base.Execute(args);
}

public override CommandResult ExecuteWithCapturedOutput(string args = "")
{
args = $"restore-projectjson {args}";
args = $"restore {args}";
return base.ExecuteWithCapturedOutput(args);
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,9 +663,9 @@ private void MigrateProject(params string[] migrateArgs)

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

Expand Down