mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
View file

@ -7,7 +7,7 @@
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

2
TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
View file

@ -4,7 +4,7 @@
<AssemblyName>AppWithRedirectsAndConfig</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

2
TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
View file

@ -4,7 +4,7 @@
<AssemblyName>AppWithRedirectsNoConfig</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

2
TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
View file

@ -3,7 +3,7 @@
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
<OutputType>Library</OutputType>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1</PackageTargetFallback>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
</PropertyGroup>
<ItemGroup>

4
TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json
View file

@ -11,9 +11,9 @@
}
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": "1.1.0"
}
},
"net451": {}

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"
}
}

7
TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
View file

@ -3,10 +3,12 @@
<PropertyGroup>
<VersionPrefix>1.0.0-rc</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp1.1</TargetFramework>
<AssemblyName>dotnet-dependency-context-test</AssemblyName>
<OutputType>Exe</OutputType>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
</PropertyGroup>
<ItemGroup>
@ -16,7 +18,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DependencyModelVersion)" />
</ItemGroup>

6
TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
View file

@ -3,12 +3,13 @@
<PropertyGroup>
<VersionPrefix>1.0.0-rc</VersionPrefix>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp1.1</TargetFramework>
<AssemblyName>dotnet-dependency-tool-invoker</AssemblyName>
<OutputType>Exe</OutputType>
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
<VersionSuffix></VersionSuffix>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
</PropertyGroup>
<PropertyGroup>
@ -28,6 +29,7 @@
<ItemGroup>
<PackageReference Include="NuGet.Frameworks" Version="$(CLI_NuGet_Version)" />
<PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(SdkNugetVersion)" />
<PackageReference Include="System.Linq" Version="4.3.0" />
</ItemGroup>
</Project>

12
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
View file

@ -1,19 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
<PropertyGroup>
<Version>1.0.0</Version>
<!--Workaround for https://github.com/NuGet/Home/issues/4583-->
<VersionSuffix></VersionSuffix>
<TargetFramework>$(CliTargetFramework)</TargetFramework>
<FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<AssemblyName>dotnet-hello</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
</ItemGroup>
</Project>

13
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
View file

@ -1,19 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
<PropertyGroup>
<Version>2.0.0</Version>
<!--Workaround for https://github.com/NuGet/Home/issues/4583-->
<VersionSuffix></VersionSuffix>
<TargetFramework>$(CliTargetFramework)</TargetFramework>
<FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<AssemblyName>dotnet-hello</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
</ItemGroup>
</Project>

10
TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
View file

@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<OutputType>Exe</OutputType>
<VersionSuffix></VersionSuffix>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
@ -17,9 +18,4 @@
<PackagePath>\prefercliruntime</PackagePath>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
</ItemGroup>
</Project>

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",

8
build/BundledRuntimes.props
View file

@ -16,10 +16,10 @@
<!-- Additional Shared Framework to be installed -->
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
<AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
<AdditionalSharedFrameworkVersion>1.0.4</AdditionalSharedFrameworkVersion>
<AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
<AdditionalHostFxrVersion>1.0.1</AdditionalHostFxrVersion>
<AdditionalCoreSetupChannel>release/1.1.0</AdditionalCoreSetupChannel>
<AdditionalSharedFrameworkVersion>1.1.1</AdditionalSharedFrameworkVersion>
<AdditionalSharedHostVersion>1.1.0</AdditionalSharedHostVersion>
<AdditionalHostFxrVersion>1.1.0</AdditionalHostFxrVersion>
<!-- Additional Downloaded Installers + Archives -->
<AdditionalDownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)</AdditionalDownloadedSharedHostInstallerFileName>

4
run-build.ps1
View file

@ -101,8 +101,8 @@ if ($LastExitCode -ne 0)
# install the post-PJnistic stage0
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
Write-Host "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-alpha-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-alpha-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Write-Host "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"

4
run-build.sh
View file

@ -168,8 +168,8 @@ if [ $? != 0 ]; then
fi
# now execute the script
echo "installing CLI: $dotnetInstallPath --channel \"master\" --version \"2.0.0-alpha-005165\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\" $LINUX_PORTABLE_INSTALL_ARGS"
$dotnetInstallPath --channel "master" --version "2.0.0-alpha-005390" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS
echo "installing CLI: $dotnetInstallPath --channel \"master\" --version \"2.0.0-preview1-005165\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\" $LINUX_PORTABLE_INSTALL_ARGS"
$dotnetInstallPath --channel "master" --version "2.0.0-preview1-005390" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS
if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
exit $?

2
src/redist/redist.csproj
View file

@ -159,7 +159,7 @@
InputFile="$(VSTestRuntimeConfigPath)"
DestinationFile="$(VSTestRuntimeConfigPath)"
ReplacementPatterns="1.0.0"
ReplacementStrings="$(CLI_SharedFrameworkVersion)" />
ReplacementStrings="1.1.1" />
</Target>
<Target Name="CrossgenPublishDir"

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
View file

@ -198,7 +198,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
var command = factory.Create("dotnet-tool-with-output-name", null);
command.CommandArgs.Should().Contain(
Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp1.0", "dotnet-tool-with-output-name.dll"));
Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp2.0", "dotnet-tool-with-output-name.dll"));
}
}
}

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
public class GivenAProjectToolsCommandResolver : TestBase
{
private static readonly NuGetFramework s_toolPackageFramework =
FrameworkConstants.CommonFrameworks.NetCoreApp10;
FrameworkConstants.CommonFrameworks.NetCoreApp20;
private const string TestProjectName = "AppWithToolDependency";

14
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
View file

@ -30,7 +30,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
var appDirectory = Path.Combine(solutionDirectory, "TestApp");
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
var mockProj = ProjectRootElement.Create();
var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@ -55,7 +55,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
var appDirectory = Path.Combine(solutionDirectory, "TestApp");
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
var mockProj = ProjectRootElement.Create();
var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@ -77,7 +77,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
var appDirectory = Path.Combine(solutionDirectory, "TestApp");
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
var mockProj = ProjectRootElement.Create();
var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@ -89,7 +89,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
var projectReference = projectReferences.First();
projectReference.Include.Should().Be(Path.Combine("..", "TestLibrary", "TestLibrary.csproj"));
projectReference.Parent.Condition.Should().Be(" '$(TargetFramework)' == 'netcoreapp1.0' ");
projectReference.Parent.Condition.Should().Be(" '$(TargetFramework)' == 'netcoreapp1.1' ");
}
[Fact]
@ -105,7 +105,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
var libraryDirectory = Path.Combine(solutionDirectory, "TestLibrary");
Directory.Delete(libraryDirectory, true);
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
var mockProj = ProjectRootElement.Create();
var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj);
var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(), mockProj.AddPropertyGroup());
@ -322,7 +322,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
var appDirectory = Path.Combine(solutionDirectory, "ProjectB");
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
var mockProj = ProjectRootElement.Create();
var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@ -337,7 +337,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
private ProjectRootElement MigrateProject(string solution, string project)
{
return MigrateProject(solution, project, FrameworkConstants.CommonFrameworks.NetCoreApp10);
return MigrateProject(solution, project, FrameworkConstants.CommonFrameworks.NetCoreApp11);
}
private ProjectRootElement MigrateProject(

16
test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs
View file

@ -220,7 +220,7 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("publish -c Debug")
.Should().Pass();
var outputDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0");
var outputDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.1");
outputDir.Should().Exist()
.And.HaveFiles(new[]
{
@ -233,7 +233,7 @@ namespace Microsoft.DotNet.Migration.Tests
Directory.Exists(Path.Combine(outputDir.FullName, "ExcludeThis1.txt")).Should().BeFalse();
Directory.Exists(Path.Combine(outputDir.FullName, "ExcludeThis2.txt")).Should().BeFalse();
var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0", "publish");
var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.1", "publish");
publishDir.Should().Exist()
.And.HaveFiles(new[]
{
@ -431,9 +431,9 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug")
.Should().Pass();
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
{
// running the app requires netcoreapp1.0
// running the app requires netcoreapp1.1
return;
}
@ -489,9 +489,9 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug")
.Should().Pass();
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
{
// running the app requires netcoreapp1.0
// running the app requires netcoreapp1.1
return;
}
@ -546,9 +546,9 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug")
.Should().Pass();
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
{
// running the app requires netcoreapp1.0
// running the app requires netcoreapp1.1
return;
}

10
test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
View file

@ -23,11 +23,11 @@ namespace Microsoft.DotNet.New.Tests
[InlineData("C#", "web", true)]
[InlineData("C#", "mvc", true)]
[InlineData("C#", "webapi", true)]
[InlineData("F#", "console", false)]
[InlineData("F#", "classlib", false)]
[InlineData("F#", "mstest", false)]
[InlineData("F#", "xunit", false)]
[InlineData("F#", "mvc", true)]
//[InlineData("F#", "console", false)]
//[InlineData("F#", "classlib", false)]
//[InlineData("F#", "mstest", false)]
//[InlineData("F#", "xunit", false)]
//[InlineData("F#", "mvc", true)]
public void TemplateRestoresAndBuildsWithoutWarnings(
string language,
string projectType,

2
test/dotnet.Tests/PackagedCommandTests.cs
View file

@ -296,7 +296,7 @@ namespace Microsoft.DotNet.Tests
.WithRestoreFiles();
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.0")
.GetFile("project.assets.json");
var stopWatch = Stopwatch.StartNew();