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

Merge pull request #5362 from dotnet/ragrawal/updatesdktrial

Browse source 
Update nuget and sdk
This commit is contained in:
Piotr Puszkiewicz 2017-01-18 16:43:06 -08:00 • committed by GitHub
commit 4e0b465093
11 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.DotNet.Cli.Utils"> <PackageReference Include="Microsoft.DotNet.Cli.Utils">
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>

4
TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
View file

@ -19,6 +19,10 @@
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="NewtonSoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />

3
TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
View file

@ -18,6 +18,9 @@
<Version>1.0.0-*</Version> <Version>1.0.0-*</Version>
</DotNetCliToolReference> </DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="NewtonSoft.Json" Version="9.0.1" />
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE;TRACE</DefineConstants> <DefineConstants>$(DefineConstants);RELEASE;TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>

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-rc3" /> <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="4.0.0-rc3-2215" />
<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-000523-01</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.1.0-preview-000523-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-20170117-4</CLI_NETSDK_Version> <CLI_NETSDK_Version>1.0.0-alpha-20170118-3</CLI_NETSDK_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170114-1-223</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-alpha-20170114-1-223</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170108-83</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta1-20170108-83</TemplateEngineVersion>

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

@ -41,7 +41,7 @@
<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-rc3</Version> <Version>4.0.0-rc3-2215</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>

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-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Packaging"> <PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Frameworks"> <PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.ProjectModel"> <PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Build"> <PackageReference Include="Microsoft.Build">
<Version>$(CLI_MSBuild_Version)</Version> <Version>$(CLI_MSBuild_Version)</Version>

4
src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs
View file

@ -251,8 +251,6 @@ namespace Microsoft.DotNet.TestFramework
var restoreArgs = new string[] { "restore", projFile.FullName }; var restoreArgs = new string[] { "restore", projFile.FullName };
var commandResult = Command.Create(_dotnetExeFile.FullName, restoreArgs) var commandResult = Command.Create(_dotnetExeFile.FullName, restoreArgs)
.CaptureStdOut()
.CaptureStdErr()
.Execute(); .Execute();
int exitCode = commandResult.ExitCode; int exitCode = commandResult.ExitCode;
@ -267,6 +265,8 @@ namespace Microsoft.DotNet.TestFramework
throw new Exception(message); throw new Exception(message);
} }
Console.WriteLine($"TestAsset Restore '{_assetName}' for {projFile.FullName} exited with {exitCode}");
} }
} }

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-rc3</Version> <Version>4.0.0-rc3-2215</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-rc3</Version> <Version>4.0.0-rc3-2215</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-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Packaging"> <PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.Frameworks"> <PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NuGet.ProjectModel"> <PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc3</Version> <Version>4.0.0-rc3-2215</Version>
</PackageReference> </PackageReference>
<PackageReference Include="moq.netcore"> <PackageReference Include="moq.netcore">
<Version>4.4.0-beta8</Version> <Version>4.4.0-beta8</Version>