diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj index 8a1e7d530..11e93e15a 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj @@ -1,10 +1,10 @@ - + 1.0.0-rc netcoreapp1.0;net451 dotnet-desktop-and-portable Exe - win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 + win7-x64;win7-x86 @@ -23,8 +23,4 @@ - - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj index b6603c2d8..c1ec38777 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -1,6 +1,6 @@  - netcoreapp1.0 + netcoreapp1.1 dotnet-hello Exe 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;fedora.23-x64;opensuse.13.2-x64 @@ -8,7 +8,7 @@ - 1.0.3 + 1.1.0 diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj index eaa06bf6e..510f6a431 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -1,7 +1,7 @@  2.0.0 - netcoreapp1.0 + netcoreapp1.1 dotnet-hello Exe 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;fedora.23-x64;opensuse.13.2-x64 @@ -9,7 +9,7 @@ - 1.0.3 + 1.1.0 diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index fe4c0e02c..9c9243987 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -1,12 +1,12 @@  - netcoreapp1.0 + netcoreapp1.1 Exe - 1.0.3 + 1.1.0 1.0.0 diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index bbfb9be11..1f2bc2278 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -1,14 +1,14 @@  1.0.0 - netcoreapp1.0 + netcoreapp1.1 AppWithDirectDep Exe false - 1.0.3 + 1.1.0 1.0.0 diff --git a/build.proj b/build.proj index 8e9fd472e..b03807f06 100644 --- a/build.proj +++ b/build.proj @@ -17,14 +17,14 @@ Debug - preview + release/1.1.0 Microsoft.NETCore.App - 1.0.3 - 1.0.1 - 1.0.1 + 1.1.0 + 1.1.0 + 1.1.0 - 1.0.5 - 1.0.5 + 1.1.0 + 1.1.0 .exe @@ -54,7 +54,7 @@ DependsOnTargets="MSBuildWorkaroundTarget; RestoreDotnetCliBuildFramework"> - diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 9718ecf7d..effb2348c 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -81,10 +81,15 @@ - - - - + + + + + + + + + @@ -98,7 +103,10 @@ - + @@ -107,7 +115,7 @@ @@ -115,7 +123,7 @@ @@ -146,7 +154,11 @@ + AssetPath="$(BinaryToCorehostifyRelDir)/%(RuntimeTargetsAssetsToRemoveFromDeps.Identity).exe" /> + + @@ -161,6 +173,7 @@ + 15.1.0-preview-000523-01 - 2.0.0-rc3-61212-03 + 2.0.0-rc4-61325-08 1.0.0-alpha-20170117-4 4.0.0-rc3 1.0.0-alpha-20170120-3-249 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 7a8439645..10981406b 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -3,8 +3,8 @@ Microsoft .NET Core 1.0.3 - SDK RC 4 Microsoft .NET Core 1.0.3 - Runtime - Microsoft .NET Core 1.0.1 - Host - Microsoft .NET Core 1.0.1 - Host FX Resolver + Microsoft .NET Core 1.1.0 - Host + Microsoft .NET Core 1.1.0 - Host FX Resolver Microsoft .NET Core 1.1.0 - Runtime Microsoft .NET Core 1.1.0 - Host diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 28589ed70..84b8ac3fc 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -43,6 +43,10 @@ $(BaseOutputDirectory)/intermediate $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish + $(Rid) + win7-$(Architecture) + osx.10.10-x64 + rhel.7-x64 @@ -121,10 +125,10 @@ - release/1.1.0 - 1.1.0 - 1.1.0 - 1.1.0 + preview + 1.0.3 + 1.0.1 + 1.0.1 dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index 59ec2aae9..d7d4c28bd 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -38,7 +38,7 @@ EnvironmentVariables=$(RunTestEnvironmentVariables); TestProject=%(TestProjects.Identity); TestResultXmlDir=$(TestResultXmlDir); - ToolPath=$(Stage0Directory); + ToolPath=$(Stage2Directory); WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity))) @@ -86,32 +86,19 @@ + Outputs="%(TestPackageProject.Identity)"> - - %(TestPackageProject.Framework) - true - /p:TargetFramework=$(Framework) - /p:RuntimeIdentifier=%(TestPackageProject.PackRuntime) - - - - - - + - + MsbuildArgs="%(TestPackageProject.MsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" /> + diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets index 06456c755..06cae3ffc 100644 --- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets +++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets @@ -93,12 +93,12 @@ - - + - $(Rid) - win7-$(Architecture) - osx.10.10-x64 - rhel.7-x64 - + runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr runtime.$(CoreCLRRid).microsoft.netcore.jit - runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr $(NuGetPackagesDir)/$(CoreCLRPackageName)/$(CoreCLRVersion)/runtimes/$(CoreCLRRid)/lib/netstandard1.0 $(NuGetPackagesDir)/$(CrossGenPackageName)/$(CoreCLRVersion)/tools/crossgen$(ExeExtension) diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj index 0be24d98c..b1b375a98 100644 --- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj +++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj @@ -90,23 +90,23 @@ Outputs="$(DebianTestResultsXmlFile)" > - - - - + + + + - - - + + + diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets index d3d11daf0..ca94cf99f 100644 --- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets +++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets @@ -15,7 +15,7 @@ - + diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index e09a73bdb..a12580b82 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -1,76 +1,23 @@ + DependsOnTargets="SetupTestPackageProjectFrameworks"> - - %(Name) - - - - %(BuildOutputs) - $(TestPackagesDir)%(NuPkgName).%(VersionPrefix)%(VersionSuffix).nupkg - - - - - - - - %(TestPackageProject.OutputPath)%(TestPackageProject.Name).dll - - - %(TestPackageProjectFrameworks.Identity) - - + DependsOnTargets="SetupTestPackageProjectBaseData"> - - $(CurrentBuildFramework) - $(CoreCLRRid) - %(OutputPath)$(CurrentBuildFramework)/ + - - - %(BaseTestPackageProject.ProjectPath) - - - - - @(__TestPackageProjectInputs) - - - - - - - <__TestPackageProjectInputs Include="%(BaseTestPackageProject.BuildInputIncludeFilter)" - Exclude="%(BaseTestPackageProject.BuildInputExcludeFilter)"> - %(BaseTestPackageProject.ProjectPath) - - - - - + Microsoft.DotNet.Cli.Utils Microsoft.DotNet.Cli.Utils.csproj True @@ -78,7 +25,17 @@ $(CliVersionPrefix)- rc4-$(TestPackageBuildVersionSuffix) False - netstandard1.5 + + + Microsoft.DotNet.Cli.Utils + Microsoft.DotNet.Cli.Utils.csproj + True + True + $(CliVersionPrefix)- + rc4-$(TestPackageBuildVersionSuffix) + False + /p:TargetFramework=netstandard1.5 Microsoft.DotNet.InternalAbstractions @@ -88,9 +45,9 @@ 2.0.0-beta- beta-$(TestPackageBuildVersionSuffix) False - netstandard1.3 - + PackageWithFakeNativeDep PackageWithFakeNativeDep.csproj False @@ -98,8 +55,7 @@ 1.0.0 True - net45 - $(CoreCLRRid) + /p:RuntimeIdentifier=$(CoreCLRRid) dotnet-dependency-context-test @@ -109,7 +65,6 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - netcoreapp1.0 dotnet-dependency-tool-invoker @@ -119,9 +74,9 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - netcoreapp1.0 - + dotnet-desktop-and-portable dotnet-desktop-and-portable.csproj True @@ -129,11 +84,10 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451;netcoreapp1.0 - $(CoreCLRRid) + /p:RuntimeIdentifier=$(CoreCLRRid) + Condition=" '$(IsDesktopAvailable)' == 'True' "> dotnet-desktop-binding-redirects dotnet-desktop-binding-redirects.csproj True @@ -142,8 +96,7 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451 - $(CoreCLRRid) + /p:RuntimeIdentifier=$(CoreCLRRid) dotnet-hello @@ -153,7 +106,6 @@ 1.0.0 True - netcoreapp1.0 dotnet-hello @@ -163,7 +115,6 @@ 2.0.0 True - netcoreapp1.0 dotnet-portable @@ -173,7 +124,6 @@ 1.0.0 True - netcoreapp1.0 dotnet-prefercliruntime @@ -183,7 +133,6 @@ 1.0.0 True - netcoreapp1.0 dotnet-tool-with-output-name @@ -194,13 +143,8 @@ 1.0.0 True - netcoreapp1.0 - - - - $(RepoRoot)%(Identity)/ $(TestPackagesBuildDir)%(Identity)/bin/$(Configuration)/ @@ -208,8 +152,6 @@ %(ProjectDir)%(ProjectName) - %(ProjectDir)**/*.* - %(ProjectDir)bin/**/*.*;%(ProjectDir)obj/**/*.* @@ -219,4 +161,4 @@ %(Name) - \ No newline at end of file + diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 7ed07d117..e1ed4996a 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -3,10 +3,10 @@ Build scripts for dotnet-cli 1.0.0 - netcoreapp1.0 + netcoreapp1.1 true bin\$(Configuration) - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 @@ -17,7 +17,7 @@ 1.6.0 - 1.0.4 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/dir.props b/dir.props index 425b5d385..0c8714f22 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.0-rc4 + 1.0.0 diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 382259d99..53f8615de 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -15,7 +15,7 @@ 1.0.1-beta-000933 - 1.0.1-beta-000933 + 1.1.0 $(CLI_NuGet_Version) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index 06346c987..2704bff36 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -3,7 +3,7 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 true ../../tools/Key.snk true diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index 1b6c8e41c..3bf1aba42 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 Exe @@ -13,7 +13,7 @@ - 1.0.3 + 1.1.0 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index c2f1a9fad..915e1a36b 100755 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -3,13 +3,13 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 dotnet Exe ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4 + $(PackageTargetFallback);dotnet5.4 @@ -32,44 +32,44 @@ 9.0.1 - 4.0.1 + 4.3.0 - 4.0.0 + 4.3.0 2.0.0 - 1.0.3 + 1.1.0 - 4.0.0 + 4.3.0 - 4.0.0 + 4.3.0 - 4.0.0 + 4.3.0 - 4.1.1 + 4.3.0 - 4.1.1 + 4.3.0 - 4.1.0 + 4.3.0 - 4.0.0 + 4.3.0 Analyzers;Build;ContentFiles;Native;Runtime $(CLI_MSBuild_Version) - 1.0.1-beta-000933 + 1.1.0 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 02884fadb..c74807583 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -3,13 +3,13 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 true - $(PackageTargetFallback);dotnet5.4 + $(PackageTargetFallback);dotnet5.4 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) @@ -24,7 +24,7 @@ $(CLI_TestPlatform_Version) - + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 40082b920..006bbeec2 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -3,11 +3,11 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index a9163b695..163953ae9 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -3,11 +3,11 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 - 1.0.3 + 1.1.0 $(CLI_NuGet_Version) diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 3f52caad6..d02092146 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -4,15 +4,15 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 true - + - + @@ -37,14 +37,18 @@ AfterTargets="Publish" BeforeTargets="RemoveFilesAfterPublish"> - - + + + - + SectionName="%(AssetsToRemoveFromDeps.SectionName)" + AssetPath="%(AssetsToRemoveFromDeps.Identity)" /> + - netcoreapp1.0 + netcoreapp1.1 ArgumentForwardingTests Exe - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -33,16 +33,16 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/ArgumentsReflector/ArgumentsReflector.csproj b/test/ArgumentsReflector/ArgumentsReflector.csproj index 18b1c199a..85e00819d 100644 --- a/test/ArgumentsReflector/ArgumentsReflector.csproj +++ b/test/ArgumentsReflector/ArgumentsReflector.csproj @@ -2,9 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 ArgumentsReflector Exe + netcoreapp1.1 @@ -16,7 +17,13 @@ - 1.0.3 + 1.1.0 + + + $(CLI_Roslyn_Version) + + + $(CLI_Roslyn_Version) diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index 5949bf3bc..07404de4c 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 EndToEnd Exe - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -40,10 +40,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 @@ -52,7 +52,7 @@ 1.0.0-prerelease-00206 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index 6b5dc5ebd..339fbd222 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.Cli.Sln.Internal.Tests ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -21,7 +21,7 @@ - 1.0.3 + 1.1.0 $(CLI_TestPlatform_Version) @@ -33,7 +33,7 @@ 2.2.0-beta4-build1194 - 4.0.0 + 4.18.0 \ No newline at end of file diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 26640ab59..be5c756b6 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -282,7 +282,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 1.0.3"); + result.Args.Should().Contain("--fx-version 1.1.0"); } [Fact] diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 479ce5be6..9e1e3201d 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 Microsoft.DotNet.Cli.Utils.Tests Exe ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -48,13 +48,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.0.0 + 4.3.0 - 4.1.1 + 4.3.0 $(CLI_NuGet_Version) @@ -75,7 +75,7 @@ 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj index f4d56da4e..793b249b9 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.Configurer.UnitTests ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -40,13 +40,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.0.0 + 4.3.0 - 4.0.0 + 4.18.0 4.4.0-beta8 diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj index 9732db55b..0b76dd001 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.ProjectJsonMigration.Tests ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -44,13 +44,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 - 4.0.0 + 4.18.0 4.4.0-beta8 diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 32a322248..3f4dfe997 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -3,13 +3,13 @@ Microsoft.DotNet.Tools.Tests.Utilities Class Library - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.Tools.Tests.Utilities ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -21,13 +21,19 @@ 1.6.0 - 4.0.0 + 4.18.0 + + + 1.1.0 + + + 4.3.0 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 9982648ea..91dbcc61a 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true Msbuild.Tests.Utilities - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -31,10 +31,10 @@ 1.6.0 - 4.1.1 + 4.3.0 - 4.0.0 + 4.18.0 2.2.0-beta4-build3444 diff --git a/test/Performance/Performance.csproj b/test/Performance/Performance.csproj new file mode 100644 index 000000000..7c295a2be --- /dev/null +++ b/test/Performance/Performance.csproj @@ -0,0 +1,55 @@ + + + + + netcoreapp1.1 + true + Performance + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + + + + + + + true + + + true + + + + + + true + + + + + + 15.0.0-preview-20161024-02 + + + 2.2.0-beta4-build1194 + + + 1.1.0 + + + 4.3.0 + + + 2.2.0-beta4-build3444 + + + 1.0.0-prerelease-00206 + + + 1.0.0-alpha-build0028 + + + + + $(DefineConstants);RELEASE + + diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index 9b619c83f..5e1b681d2 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true binding-redirects.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -13,10 +13,10 @@ - + - + diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 657fc9dbc..c5d314cde 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true crossgen.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -33,7 +33,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj index 6a052db05..63c5eff1c 100644 --- a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj +++ b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-add-package.Tests $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -17,7 +17,7 @@ - + diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 09141e8e2..d7072a465 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-add-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -36,10 +36,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index 3efad2804..10a181763 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-build.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index a9b94fe86..0b2aea8f7 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-help.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -40,7 +40,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index e3c8454f4..4fbc41e22 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-list-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -36,16 +36,16 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 - 4.0.0 + 4.18.0 diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 3dc1cb000..64e43d38a 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-migrate.Tests - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -48,13 +48,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 - 4.0.0 + 4.18.0 4.4.0-beta8 diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index 7907fe5be..a601acd01 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-msbuild.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 4.1.1 diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 80aed33d3..00621c34a 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -41,7 +41,8 @@ namespace Microsoft.DotNet.New.Tests if (useNuGetConfigForAspNet) { - File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config")); + var configFile = new FileInfo(Path.Combine(rootPath,"..","..","..","..","NuGet.tempaspnetpatch.config")); + File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config")); } new TestCommand("dotnet") diff --git a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs index b61565d83..f89bca7cd 100644 --- a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs @@ -38,7 +38,8 @@ namespace Microsoft.DotNet.New3.Tests if (useNuGetConfigForAspNet) { - File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config")); + var configFile = new FileInfo(Path.Combine(rootPath,"..","..","..","..","NuGet.tempaspnetpatch.config")); + File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config")); } string globalJsonPath = Path.Combine(rootPath, "global.json"); diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 30e772e67..fc811a75c 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-new.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index 70805d0f3..b67766466 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-nuget.UnitTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -46,10 +46,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index e0b97e719..b6d0698e3 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-pack.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -40,13 +40,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 - 4.0.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index fc1d3fad8..23daaa675 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-publish.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -42,10 +42,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index c03c7c6ae..a339974dd 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-remove-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -36,10 +36,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 @@ -48,7 +48,7 @@ $(CLI_MSBuild_Version) - 4.0.0 + 4.18.0 diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index 0adf2a9de..2cc814fb5 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-restore.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) @@ -55,10 +55,10 @@ 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 - 4.0.0 + 4.18.0 diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index 6fa3f48be..4b3dece00 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-run.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj index 08a73c20e..29025c38a 100644 --- a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj +++ b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-sln-add.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -24,7 +24,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj index 9c5727e68..6dc24ff30 100644 --- a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj +++ b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-sln-list.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -24,7 +24,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj index 50a6d2592..5e062c352 100644 --- a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj +++ b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-sln-remove.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -24,7 +24,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index 443a67a9d..aa68a2b2b 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-test.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.0 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index c0ce2eef3..99ab8dfcc 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-vstest.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.0 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index b08cc2eeb..d1f8b0c93 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -267,7 +267,6 @@ namespace Microsoft.DotNet.Tests new BuildCommand() .WithWorkingDirectory(testInstance.Root) - .WithFramework(NuGet.Frameworks.FrameworkConstants.CommonFrameworks.NetCoreApp10) .Execute() .Should().Pass(); diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index c0861efb2..afde5c00a 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet.Tests ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -60,10 +60,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 @@ -72,7 +72,7 @@ 1.0.0-prerelease-00206 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/dotnet.Tests/¬/.dotnet/optimizationdata/1.0.0-rc4-004536/osx.10.11-x64/dotnet b/test/dotnet.Tests/¬/.dotnet/optimizationdata/1.0.0-rc4-004536/osx.10.11-x64/dotnet deleted file mode 100644 index 30393cb6d..000000000 Binary files a/test/dotnet.Tests/¬/.dotnet/optimizationdata/1.0.0-rc4-004536/osx.10.11-x64/dotnet and /dev/null differ diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index 30faccc85..c6adb0cd5 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true msbuild.IntegrationTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,7 +35,7 @@ 2.2.0-beta4-build1194 - 1.0.0 + 1.1.0 2.2.0-beta4-build3444 diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index 3d673f7ac..a1d99b659 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 Exe win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 @@ -15,7 +15,7 @@ - 1.0.3 + 1.1.0 diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj index c801a1d11..090b114cd 100644 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 portable Exe - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -13,7 +13,7 @@ - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version)