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

Merge pull request #5178 from livarcocc/update_tools_msbuild3

Browse source 
Updating the migrated tools version to 1.0.0-msbuild3-final.
This commit is contained in:
Livar 2016-12-30 13:16:29 -08:00 • committed by GitHub
commit 06d33f01ce
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs
View file

@ -5,13 +5,13 @@ namespace Microsoft.DotNet.ProjectJsonMigration
{ {
internal class ConstantPackageVersions internal class ConstantPackageVersions
{ {
public const string AspNetToolsVersion = "1.0.0-msbuild1-final"; public const string AspNetToolsVersion = "1.0.0-msbuild3-final";
public const string TestSdkPackageVersion = "15.0.0-preview-20161024-02"; public const string TestSdkPackageVersion = "15.0.0-preview-20161227-02";
public const string XUnitPackageVersion = "2.2.0-beta4-build3444"; public const string XUnitPackageVersion = "2.2.0-beta4-build3444";
public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1194"; public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1194";
public const string MstestTestAdapterVersion = "1.1.3-preview"; public const string MstestTestAdapterVersion = "1.1.8-rc";
public const string MstestTestFrameworkVersion = "1.0.4-preview"; public const string MstestTestFrameworkVersion = "1.0.8-rc";
public const string BundleMinifierToolVersion = "2.2.301"; public const string BundleMinifierToolVersion = "2.2.301";
public const string WebSdkPackageVersion = "1.0.0-alpha-20161117-1-119" ; public const string WebSdkPackageVersion = "1.0.0-alpha-20161205-1-154" ;
} }
} }

12
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
View file

@ -250,7 +250,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "Microsoft.NET.Test.Sdk" && i => (i.Include == "Microsoft.NET.Test.Sdk" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161024-02" && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161227-02" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().NotContain( mockProj.Items.Should().NotContain(
@ -283,7 +283,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "Microsoft.NET.Test.Sdk" && i => (i.Include == "Microsoft.NET.Test.Sdk" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161024-02") && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161227-02") &&
i.GetMetadataWithName("Version").ExpressedAsAttribute); i.GetMetadataWithName("Version").ExpressedAsAttribute);
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
@ -325,7 +325,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "Microsoft.NET.Test.Sdk" && i => (i.Include == "Microsoft.NET.Test.Sdk" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161024-02" && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161227-02" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
@ -364,19 +364,19 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "Microsoft.NET.Test.Sdk" && i => (i.Include == "Microsoft.NET.Test.Sdk" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161024-02" && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20161227-02" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "MSTest.TestAdapter" && i => (i.Include == "MSTest.TestAdapter" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "1.1.3-preview" && i.GetMetadataWithName("Version").Value == "1.1.8-rc" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "MSTest.TestFramework" && i => (i.Include == "MSTest.TestFramework" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "1.0.4-preview" && i.GetMetadataWithName("Version").Value == "1.0.8-rc" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().NotContain( mockProj.Items.Should().NotContain(

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

@ -137,6 +137,8 @@ namespace Microsoft.DotNet.Migration.Tests
var projectDirectory = testInstance.Root.FullName; var projectDirectory = testInstance.Root.FullName;
File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(projectDirectory, "NuGet.Config"));
MigrateProject(new [] { projectDirectory }); MigrateProject(new [] { projectDirectory });
Restore(projectDirectory); Restore(projectDirectory);

1
test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
View file

@ -4,6 +4,7 @@
<!--To inherit the global NuGet package sources remove the <clear/> line below --> <!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear /> <clear />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" /> <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="asp-msbuild3-feed" value="https://dotnet.myget.org/F/msbuildtools/api/v3/index.json" />
<add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" /> <add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
<add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> <add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />