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

4
TestAssets/TestProjects/AppWith2Tfm0Rid/project.json
View file

@ -10,10 +10,10 @@
"System.Xml": {}
}
},
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NetCore.App": {
"version": "1.0.3",
"version": "1.1.0",
"type": "platform"
}
}

4
TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json
View file

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

4
TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json
View file

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

4
TestAssets/TestProjects/AppWithAssemblyInfo/project.json
View file

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

2
TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
View file

@ -5,7 +5,7 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

2
TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
View file

@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

4
TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
View file

@ -4,10 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.0"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/TestProjects/AppWithPackageNamedAfterFolder/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/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json
View file

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

8
TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
View file

@ -7,13 +7,11 @@
<AssemblyName>DependencyContextFromTool</AssemblyName>
<OutputType>Exe</OutputType>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="dotnet-dependency-context-test" Version="1.0.0-*" />
</ItemGroup>

4
TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
View file

@ -14,7 +14,7 @@
"version": "1.0.0-*",
"target": "project"
},
"Microsoft.NETCore.App": "1.0.1",
"Microsoft.NETCore.App": "1.1.0",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509"
},
"tools": {
@ -28,7 +28,7 @@
}
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": "dnxcore50"
}
},

2
TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
View file

@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

4
TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json
View file

@ -4,10 +4,10 @@
"emitEntryPoint": true
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NetCore.App": {
"version": "1.0.3",
"version": "1.1.0",
"type": "platform"
}
}

4
TestAssets/TestProjects/PJTestAppSimple/project.json
View file

@ -4,10 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.0"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json
View file

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

4
TestAssets/TestProjects/ProjectJsonWebTemplate/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.1",
"version": "1.1.0",
"type": "platform"
},
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
@ -71,7 +71,7 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"dotnet5.6",
"dnxcore50",

4
TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json
View file

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

4
TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json
View file

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

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/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.0"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json
View file

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

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json
View file

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

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json
View file

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

4
TestAssets/TestProjects/TestAppWithContents/project.json
View file

@ -19,12 +19,12 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.1",
"version": "1.1.0",
"type": "platform"
}
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"publishOptions": {
"include": "testcontentfile.txt"

4
TestAssets/TestProjects/TestAppWithEmbeddedResources/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/TestProjects/TestAppWithExplicitInclude/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.0"
}
},
"imports": "dnxcore50"

4
TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/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.0"
}
},
"imports": "dnxcore50"

4
TestAssets/TestProjects/TestAppWithLibrary/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": {},

4
TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json
View file

@ -5,10 +5,10 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.0"
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"TestLibrary": {
"target": "project",

4
TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json
View file

@ -6,11 +6,11 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.0"
}
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"scripts": {
"prepublish": [

2
TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
View file

@ -5,7 +5,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

4
TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json
View file

@ -5,12 +5,12 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.1",
"version": "1.1.0",
"type": "platform"
}
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimeOptions": {
"somethingString": "anything",

4
TestAssets/TestProjects/TestAppWithSigning/project.json
View file

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

4
TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json
View file

@ -6,10 +6,10 @@
},
"dependencies": {
"ProjectB": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.0"
},
"frameworks": {
"netcoreapp1.0": {}
"netcoreapp1.1": {}
},
"runtimes": {
"win7-x64": {},

4
TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.1.0",
"type": "platform"
},
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
@ -70,7 +70,7 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"dotnet5.6",
"dnxcore50",