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

Merge pull request #5234 from harshjain2/tpv2update

Browse source 
Updated version of Test Platform
This commit is contained in:
Livar 2017-01-07 14:44:01 -08:00 committed by GitHub
commit 87e9815a25
7 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<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-5</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-20170106-08</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170106-79</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta1-20170106-79</TemplateEngineVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -6,7 +6,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration
internal class ConstantPackageVersions internal class ConstantPackageVersions
{ {
public const string AspNetToolsVersion = "1.0.0-msbuild3-final"; public const string AspNetToolsVersion = "1.0.0-msbuild3-final";
public const string TestSdkPackageVersion = "15.0.0-preview-20161227-02"; public const string TestSdkPackageVersion = "15.0.0-preview-20170106-08";
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.8-rc"; public const string MstestTestAdapterVersion = "1.1.8-rc";

5
src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj
View file

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161227-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" /> <PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" />
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" /> <PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
</ItemGroup> </ItemGroup>

3
src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj
View file

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161227-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
</ItemGroup> </ItemGroup>

3
src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj
View file

@ -1,7 +1,6 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup> </PropertyGroup>
@ -14,7 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" /> <PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161227-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" /> <PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" />
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" /> <PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*"> <PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*">

3
src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj
View file

@ -1,7 +1,6 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup> </PropertyGroup>
@ -13,7 +12,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161227-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" /> <PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />

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

@ -270,7 +270,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-20161227-02" && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20170106-08" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().NotContain( mockProj.Items.Should().NotContain(
@ -303,7 +303,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-20161227-02") && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20170106-08") &&
i.GetMetadataWithName("Version").ExpressedAsAttribute); i.GetMetadataWithName("Version").ExpressedAsAttribute);
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
@ -345,7 +345,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-20161227-02" && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20170106-08" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
@ -384,7 +384,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-20161227-02" && i.GetMetadataWithName("Version").Value == "15.0.0-preview-20170106-08" &&
i.GetMetadataWithName("Version").ExpressedAsAttribute)); i.GetMetadataWithName("Version").ExpressedAsAttribute));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(