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

Merge pull request #4636 from Faizan2304/xunitTemplateFix

Browse source 
Update version of xunit adapter in test assets and xunit template
This commit is contained in:
Livar 2016-11-08 14:42:47 -08:00 committed by GitHub
commit 312559ccdc
8 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/Nuget.config
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
</configuration>

4
TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
View file

@ -29,10 +29,10 @@
<Version>15.0.0-preview-20161024-02</Version> <Version>15.0.0-preview-20161024-02</Version>
</PackageReference> </PackageReference>
<PackageReference Include="xunit"> <PackageReference Include="xunit">
<Version>2.2.0-beta3-build3402</Version> <Version>2.2.0-beta4-build3444</Version>
</PackageReference> </PackageReference>
<PackageReference Include="xunit.runner.visualstudio"> <PackageReference Include="xunit.runner.visualstudio">
<Version>2.2.0-beta4-build1188</Version> <Version>2.2.0-beta4-build1194</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

12
TestAssets/TestProjects/VSTestXunitDotNetCore/Nuget.config
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
</configuration>

4
TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
View file

@ -23,10 +23,10 @@
<Version>15.0.0-preview-20161024-02</Version> <Version>15.0.0-preview-20161024-02</Version>
</PackageReference> </PackageReference>
<PackageReference Include="xunit"> <PackageReference Include="xunit">
<Version>2.2.0-beta3-build3402</Version> <Version>2.2.0-beta4-build3444</Version>
</PackageReference> </PackageReference>
<PackageReference Include="xunit.runner.visualstudio"> <PackageReference Include="xunit.runner.visualstudio">
<Version>2.2.0-beta4-build1188</Version> <Version>2.2.0-beta4-build1194</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

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

@ -7,8 +7,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration
{ {
public const string AspNetToolsVersion = "1.0.0-msbuild1-final"; public const string AspNetToolsVersion = "1.0.0-msbuild1-final";
public const string TestSdkPackageVersion = "15.0.0-preview-20161024-02"; public const string TestSdkPackageVersion = "15.0.0-preview-20161024-02";
public const string XUnitPackageVersion = "2.2.0-beta3-build3402"; public const string XUnitPackageVersion = "2.2.0-beta4-build3444";
public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1188"; public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1194";
public const string MstestTestAdapterVersion = "1.1.3-preview"; public const string MstestTestAdapterVersion = "1.1.3-preview";
public const string MstestTestFrameworkVersion = "1.0.4-preview"; public const string MstestTestFrameworkVersion = "1.0.4-preview";
public const string BundleMinifierToolVersion = "2.2.301"; public const string BundleMinifierToolVersion = "2.2.301";

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

@ -23,10 +23,10 @@
<Version>15.0.0-preview-20161024-02</Version> <Version>15.0.0-preview-20161024-02</Version>
</PackageReference> </PackageReference>
<PackageReference Include="xunit"> <PackageReference Include="xunit">
<Version>2.2.0-beta3-build3402</Version> <Version>2.2.0-beta4-build3444</Version>
</PackageReference> </PackageReference>
<PackageReference Include="xunit.runner.visualstudio"> <PackageReference Include="xunit.runner.visualstudio">
<Version>2.2.0-beta4-build1188</Version> <Version>2.2.0-beta4-build1194</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

2
src/redist/redist.csproj
View file

@ -36,7 +36,7 @@
<Version>15.0.0-preview-20161102-02</Version> <Version>15.0.0-preview-20161102-02</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.TestPlatform.Build"> <PackageReference Include="Microsoft.TestPlatform.Build">
<Version>15.0.0-preview-20161103-02</Version> <Version>15.0.0-preview-20161107-06</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">

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

@ -312,12 +312,12 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "xunit" && i => (i.Include == "xunit" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "2.2.0-beta3-build3402")); i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build3444"));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "xunit.runner.visualstudio" && i => (i.Include == "xunit.runner.visualstudio" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build1188")); i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build1194"));
mockProj.Items.Should().NotContain( mockProj.Items.Should().NotContain(
i => (i.Include == "MSTest.TestAdapter" && i.ItemType == "PackageReference")); i => (i.Include == "MSTest.TestAdapter" && i.ItemType == "PackageReference"));
@ -351,12 +351,12 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "xunit" && i => (i.Include == "xunit" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "2.2.0-beta3-build3402")); i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build3444"));
mockProj.Items.Should().ContainSingle( mockProj.Items.Should().ContainSingle(
i => (i.Include == "xunit.runner.visualstudio" && i => (i.Include == "xunit.runner.visualstudio" &&
i.ItemType == "PackageReference" && i.ItemType == "PackageReference" &&
i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build1188")); i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build1194"));
mockProj.Items.Should().NotContain( mockProj.Items.Should().NotContain(
i => (i.Include == "MSTest.TestAdapter" && i.ItemType == "PackageReference")); i => (i.Include == "MSTest.TestAdapter" && i.ItemType == "PackageReference"));