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

Updated tests to the new appropriate TFM 1.1, since we need a shared runtime besides 2.0 in the new distros. Once we have vstest for 2.0 then we won't need it anymore.

Browse source
This commit is contained in:
Livar Cunha 2017-03-09 21:17:10 -08:00 • committed by Livar Cunha
parent cfd0874c96
commit bb178a5133
80 changed files with 172 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
View file

@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>dotnet-throwingtool</AssemblyName>
<PackageId>$(AssemblyName)</PackageId>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>

5
TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
View file

@ -4,12 +4,9 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="dotnet-nonexistingtool" Version="1.0.0" />
</ItemGroup>

4
TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json
View file

@ -4,14 +4,14 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1",
"Microsoft.NETCore.App": "1.1.1",
"TestLibraryAsAPackage": {
"version": "1.0.0",
"target": "package"
}
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json
View file

@ -9,10 +9,10 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json
View file

@ -5,10 +5,10 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json
View file

@ -1,12 +1,12 @@
{
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.1.0",
"type": "platform"
}
}

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json
View file

@ -13,10 +13,10 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json
View file

@ -13,10 +13,10 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
},
"TestLibrary": {
"target": "project",
@ -20,7 +20,7 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": "dnxcore50"
}
}

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json
View file

@ -5,10 +5,10 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json
View file

@ -5,10 +5,10 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json
View file

@ -5,10 +5,10 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.1"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json
View file

@ -7,11 +7,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json
View file

@ -8,11 +8,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json
View file

@ -7,11 +7,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json
View file

@ -8,11 +8,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json
View file

@ -11,11 +11,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json
View file

@ -7,11 +7,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json
View file

@ -19,11 +19,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.1"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json
View file

@ -8,11 +8,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json
View file

@ -7,11 +7,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json
View file

@ -8,11 +8,11 @@
},
"dependencies": {},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json
View file

@ -10,11 +10,11 @@
}
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
},
"imports": "dnxcore50"

4
TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json
View file

@ -9,10 +9,10 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.0"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

2
TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json
View file

@ -9,7 +9,7 @@
}
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": "dnxcore50"
}
}

4
TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
View file

@ -6,14 +6,14 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.0"
},
"ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
"target": "project"
}
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": "dnxcore50"
}
}