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

Merge branch 'rel/1.0.0' into clitest3verb

Browse source
This commit is contained in:
Faizan Ahmad 2016-10-12 11:57:46 +05:30
commit 391fff1f20
95 changed files with 735 additions and 854 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file

@ -16,8 +16,9 @@
<PackageReference Include="Microsoft.NETCore.App">
<Version>1.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Sdk">
<Version>1.0.0-alpha-20161007-1</Version>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161010-1</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>

10
TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/GivenThatIWantSomeFakeTests.cs
View file

@ -8,14 +8,14 @@ namespace FakeTests
{
public class GivenThatIWantSomeFakeTests
{
#if NET451
#if NET46
[Fact]
public void NET451_succeeds()
public void NET46_succeeds()
{
Assert.True(true);
}
[Fact(Skip="Skipped for NET451")]
[Fact(Skip="Skipped for NET46")]
public void SkippedTest()
{
@ -45,8 +45,8 @@ namespace FakeTests
{
var shouldFail = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_TEST_SHOULD_FAIL"));
#if NET451
Assert.True(shouldFail, "Failing in NET451");
#if NET46
Assert.True(shouldFail, "Failing in NET46");
#else
Assert.True(shouldFail, "Failing in NETCOREAPP1.0");
#endif

6
TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
View file

@ -20,7 +20,11 @@
"System.Runtime.Serialization.Primitives": "4.1.1"
}
},
"net451": {}
"net46": {
"dependencies": {
"System.IO.FileSystem": "4.0.1"
}
}
},
"testRunner": "xunit"
}

2
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json
View file

@ -3,7 +3,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
"Microsoft.NET.Sdk": "1.0.0-alpha-20161010-1",
"NETStandard.Library": "1.6.0"
}
}

2
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json
View file

@ -3,7 +3,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
"Microsoft.NET.Sdk": "1.0.0-alpha-20161010-1",
"NETStandard.Library": "1.6.0"
}
}

2
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json
View file

@ -3,7 +3,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
"Microsoft.NET.Sdk": "1.0.0-alpha-20161010-1",
"NETStandard.Library": "1.6.0"
}
}

5
TestAssets/TestProjects/VSTestDotNetCoreProject/VSTestDotNetCoreProject.csproj
View file

@ -16,8 +16,9 @@
<PackageReference Include="Microsoft.NETCore.App">
<Version>1.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Sdk">
<Version>1.0.0-alpha-20161007-1</Version>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161010-1</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="MSTest.TestFramework">
<Version>1.0.4-preview</Version>