From df98363da453eac59f763e743bae40b927dad692 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 17 Mar 2017 20:27:02 -0400 Subject: [PATCH 01/18] Remove --linux-portable from dotnet-install.sh It duplicates functionality achieved by using `--runtime-id linux-x64`. Remove it and fix callers. Keep the the --linux-portable flag in the build scripts; that now calls --runtime-id linux-x64 in the install script. --- run-build.sh | 2 +- scripts/obtain/dotnet-install.sh | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/run-build.sh b/run-build.sh index 9c5c2beb4..8efb16cbf 100755 --- a/run-build.sh +++ b/run-build.sh @@ -97,7 +97,7 @@ while [[ $# > 0 ]]; do shift ;; --linux-portable) - LINUX_PORTABLE_INSTALL_ARGS="--linux-portable" + LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64" # Until we get test support for 2.0 we need to pass in the targets without test. CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:CLITargets=\"Prepare;Compile;Package;Publish\"" args=( "${args[@]/$1}" ) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 780806f3e..a4e889f18 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -113,10 +113,7 @@ get_current_os_name() { eval $invocation local uname=$(uname) - if [ "$linux_portable" = true ]; then - echo "linux" - return 0 - elif [ "$uname" = "Darwin" ]; then + if [ "$uname" = "Darwin" ]; then echo "osx" return 0 elif [ -n "$runtime_id" ]; then @@ -601,7 +598,6 @@ azure_feed="https://dotnetcli.azureedge.net/dotnet" uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet" verbose=false shared_runtime=false -linux_portable=false runtime_id="" while [ $# -ne 0 ] @@ -643,9 +639,6 @@ do shift azure_feed="$1" ;; - --linux-portable|-[Ll]inux[Pp]ortable) - linux_portable=true - ;; --runtime-id|-[Rr]untime[Ii]d) shift runtime_id="$1" @@ -674,9 +667,7 @@ do echo " --no-path, -NoPath Do not set PATH for the current process." echo " --verbose,-Verbose Display diagnostics information." echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed" - echo " --linux-portable Installs the Linux portable .NET Tools instead of a distro-specific version." - echo " -LinuxPortable" - echo " --runtime-id Installs the .NET Tools for the given platform (such as linux-x64)." + echo " --runtime-id Installs the .NET Tools for the given platform (use linux-x64 for portable linux)." echo " -RuntimeId" echo " -?,--?,-h,--help,-Help Shows this help message" echo "" From cfd0874c962c0f09e404573e8f69c8dc173c24f1 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 8 Mar 2017 20:03:46 -0800 Subject: [PATCH 02/18] Modified test assets and added the new rids back as badges and CI. Still need to update tests. --- .../AppWithProjTool2Fx/App.csproj | 3 ++- .../AppWithRedirectsAndConfig.csproj | 1 + .../AppWithRedirectsNoConfig.csproj | 1 + .../LibWithProjTool2Fx/Lib.csproj | 1 + .../AppDependingOnOtherAsTool.csproj | 1 + .../AppWithDepOnTool/AppWithDepOnTool.csproj | 1 + .../ToolWithRandomPackageName.csproj | 8 +++----- .../ToolWithOutputName/ToolWithOutputName.csproj | 9 ++++----- .../dotnet-dependency-tool-invoker.csproj | 6 +++--- .../dotnet-desktop-and-portable.csproj | 12 +++++++----- .../dotnet-portable/dotnet-portable.csproj | 6 ++++-- .../AppWithDepOnToolWithOutputName.csproj | 1 + .../AppWithDirectAndToolDep.csproj | 1 + .../AppWithDirectDepWithOutputName.csproj | 1 + .../MSBuildAppWithMultipleFrameworksAndTools.csproj | 1 + .../AppWithToolDependency.csproj | 1 + .../MSBuildAppWithMultipleFrameworksAndTools.csproj | 1 + .../MSBuildTestApp/MSBuildTestApp.csproj | 3 ++- .../TestAppWithProjDepTool.csproj | 1 + build/VersionBadge.props | 3 +++ .../CheckIfAllBuildsHavePublished.cs | 3 +++ netci.groovy | 2 +- run-build.ps1 | 4 ++-- run-build.sh | 4 ++-- src/redist/redist.csproj | 12 ++++++++++++ 25 files changed, 60 insertions(+), 27 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index 3d0fbce93..c8b5d990f 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -5,8 +5,9 @@ netcoreapp2.0;net451 Exe $(PackageTargetFallback);portable-net45+win8;dnxcore50 - 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 + 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 $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj index 82a5ad25d..160921bae 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj @@ -4,6 +4,7 @@ AppWithRedirectsAndConfig Exe win7-x64;win7-x86 + netcoreapp2.0 diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj index 94b99d56b..dd339afa3 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj @@ -4,6 +4,7 @@ AppWithRedirectsNoConfig Exe win7-x64;win7-x86 + netcoreapp2.0 diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index 78ddee6cb..b8d373889 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -3,6 +3,7 @@ netstandard1.6;net451 Library $(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1 + netcoreapp2.0 diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj index b6c5d14f1..7159443c2 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj @@ -5,6 +5,7 @@ Exe netcoreapp2.0 $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj index f8265b727..f62de8419 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj @@ -6,6 +6,7 @@ netcoreapp2.0 random-name $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj index 8c7d3963a..3cbeb2a34 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj @@ -1,11 +1,13 @@  + Exe - netcoreapp1.0 + netcoreapp2.0 random-name $(GeneratedPackageId) dotnet-randompackage + $(CLI_SharedFrameworkVersion) @@ -14,8 +16,4 @@ - - - - diff --git a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj index 7ab96d6db..4844d4232 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj +++ b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj @@ -1,9 +1,12 @@  + + - netcoreapp1.0 + netcoreapp2.0 dotnet-tool-with-output-name ToolWithOutputName Exe + $(CLI_SharedFrameworkVersion) @@ -12,8 +15,4 @@ - - - - diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index 7222996bc..4e590ef5d 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -3,11 +3,12 @@ 1.0.0-rc - netcoreapp1.0 + netcoreapp2.0 dotnet-dependency-tool-invoker Exe - $(PackageTargetFallback);portable-net45+win8;dnxcore50 + $(PackageTargetFallback);portable-net45+win8;dnxcore50 + $(CLI_SharedFrameworkVersion) @@ -25,7 +26,6 @@ - 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 ab8932531..41585032e 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,21 +1,23 @@  + + 1.0.0-rc - netcoreapp1.0;net451 + netcoreapp2.0;net451 dotnet-desktop-and-portable Exe win7-x64;win7-x86 - + $(ProjectRuntimeConfigFilePath) - - - + + $(CLI_SharedFrameworkVersion) + diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj index 31f549c06..6ec578ca4 100644 --- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj +++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj @@ -1,10 +1,12 @@  + + - netcoreapp1.0 + netcoreapp2.0 dotnet-portable Exe - 1.0.4 + $(CLI_SharedFrameworkVersion) diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index ddaf88766..c1d0bb41a 100755 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj @@ -5,6 +5,7 @@ netcoreapp2.0 Exe $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index a37cf3c78..dd88a2bfc 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -2,6 +2,7 @@ netcoreapp2.0 Exe + netcoreapp2.0 diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj index a74d7184d..9b8907373 100755 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj @@ -5,6 +5,7 @@ netcoreapp2.0 Exe $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 33cb2b5a7..80d0ffd4b 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -4,6 +4,7 @@ Exe net451;netcoreapp2.0 + netcoreapp2.0 diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj index a22545fdc..f3506fae4 100755 --- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj @@ -5,6 +5,7 @@ netcoreapp2.0 Exe $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 766c1ae66..67092b919 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -4,6 +4,7 @@ Exe net451;netcoreapp2.0 + netcoreapp2.0 diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index ca4a8237d..67e9b56a0 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -4,8 +4,9 @@ Exe netcoreapp2.0 - 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 + 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 $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index ba6ef78be..66c65a7ff 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -5,6 +5,7 @@ Exe netcoreapp2.0 $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/build/VersionBadge.props b/build/VersionBadge.props index cb2f3efde..42f210be0 100644 --- a/build/VersionBadge.props +++ b/build/VersionBadge.props @@ -2,6 +2,9 @@ $(OSName)_$(Architecture) ubuntu_16_04_x64 + ubuntu_16_10_x64 + fedora_24_x64 + opensuse_42_1_x64 $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index 8be9f8f4d..ddbe71ed2 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -53,11 +53,14 @@ namespace Microsoft.DotNet.Cli.Build { "win_x64", false }, { "ubuntu_x64", false }, { "ubuntu_16_04_x64", false }, + { "ubuntu_16_10_x64", false }, { "rhel_x64", false }, { "osx_x64", false }, { "debian_x64", false }, { "centos_x64", false }, { "linux_x64", false }, + { "fedora_24_x64", false }, + { "opensuse_42_1_x64", false } }; if (!badges.ContainsKey(VersionBadgeMoniker)) diff --git a/netci.groovy b/netci.groovy index b3b59263d..374eaa962 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] +def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'Ubuntu16.10:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora24:x64:Release', 'OpenSUSE42.1:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() diff --git a/run-build.ps1 b/run-build.ps1 index ea77e8983..b939b605f 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -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"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +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""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index 9c5c2beb4..9c78a3827 100755 --- a/run-build.sh +++ b/run-build.sh @@ -168,8 +168,8 @@ if [ $? != 0 ]; then fi # now execute the script -echo "installing CLI: $dotnetInstallPath --channel \"master\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\" $LINUX_PORTABLE_INSTALL_ARGS" -$dotnetInstallPath --channel "master" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS +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 if [ $? != 0 ]; then echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2 exit $? diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 7c7ef6569..dde8ca364 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -150,6 +150,18 @@ AfterTargets="Publish"> + + + $(PublishDir)/vstest.console.runtimeconfig.json + + + + From bb178a5133202018ba1487b876629c604aca10ba Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 9 Mar 2017 21:17:10 -0800 Subject: [PATCH 03/18] 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. --- .../AppWithProjTool2Fx/App.csproj | 2 +- .../AppWithRedirectsAndConfig.csproj | 2 +- .../AppWithRedirectsNoConfig.csproj | 2 +- .../LibWithProjTool2Fx/Lib.csproj | 2 +- .../ProjectA/project.json | 4 ++-- .../App/AppThrowingException.csproj | 3 ++- .../AppWithNonExistingToolDependency.csproj | 5 +---- .../TestApp/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestApp/TestAssets/TestAsset/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../PJAppWithSlnVersion14/project.json | 4 ++-- .../PJAppWithSlnVersion15/project.json | 4 ++-- .../PJAppWithSlnVersionUnknown/project.json | 4 ++-- .../PJDeprecatedCompilation/project.json | 4 ++-- .../PJDeprecatedCompile/project/project.json | 4 ++-- .../project/project.json | 4 ++-- .../PJDeprecatedCompileExclude/project.json | 4 ++-- .../PJDeprecatedContent/project/project.json | 4 ++-- .../PJDeprecatedNamedResource/project.json | 4 ++-- .../PJDeprecatedPack/project.json | 4 ++-- .../PJDeprecatedResource/project/project.json | 4 ++-- .../project/project.json | 4 ++-- .../PJDeprecatedResourceExclude/project.json | 4 ++-- .../PJHalfMigrated/ProjectB/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../dotnet-dependency-context-test.csproj | 7 ++++--- .../dotnet-dependency-tool-invoker.csproj | 6 ++++-- .../v1/dotnet-hello/dotnet-hello.csproj | 12 ++++-------- .../v2/dotnet-hello/dotnet-hello.csproj | 13 ++++--------- .../dotnet-prefercliruntime.csproj | 10 +++------- .../TestProjects/AppWith2Tfm0Rid/project.json | 4 ++-- .../AppWithAppDependency/TestApp1/project.json | 4 ++-- .../AppWithAppDependency/TestApp2/project.json | 4 ++-- .../AppWithAssemblyInfo/project.json | 4 ++-- .../AppWithDirectDepWithOutputName.csproj | 2 +- ...BuildAppWithMultipleFrameworksAndTools.csproj | 2 +- .../AppWithOutputAssemblyName/project.json | 4 ++-- .../TestAssets/TestAsset/project.json | 4 ++-- .../test/App.Tests/project.json | 4 ++-- .../DependencyContextFromTool.csproj | 8 +++----- .../FSharpTestProjects/TestApp/project.json | 4 ++-- ...BuildAppWithMultipleFrameworksAndTools.csproj | 2 +- .../PJAppWithMultipleFrameworks/project.json | 4 ++-- .../TestProjects/PJTestAppSimple/project.json | 4 ++-- .../ProjectJsonConsoleTemplate/project.json | 4 ++-- .../ProjectJsonWebTemplate/project.json | 4 ++-- .../src with spaces/ProjectJ/project.json | 4 ++-- .../src/ProjectH/project.json | 4 ++-- .../TestAppDependencyGraph/ProjectA/project.json | 4 ++-- .../TestAppDependencyGraph/ProjectF/project.json | 4 ++-- .../src with spaces/ProjectJ/project.json | 4 ++-- .../src/ProjectH/project.json | 4 ++-- .../TestAppWithContents/project.json | 4 ++-- .../TestAppWithEmbeddedResources/project.json | 4 ++-- .../TestAppWithExplicitInclude/project.json | 4 ++-- .../TestAppWithExplicitIncludeGlob/project.json | 4 ++-- .../TestAppWithLibrary/TestApp/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestAppWithMigrateableScripts/project.json | 4 ++-- .../TestAppWithProjDepTool.csproj | 2 +- .../TestAppWithRuntimeOptions/project.json | 4 ++-- .../TestProjects/TestAppWithSigning/project.json | 4 ++-- .../ProjectA/project.json | 4 ++-- .../project.json | 4 ++-- build/BundledRuntimes.props | 8 ++++---- run-build.ps1 | 4 ++-- run-build.sh | 4 ++-- src/redist/redist.csproj | 2 +- .../GivenAProjectDependenciesCommandFactory.cs | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- ...GivenThatIWantToMigrateProjectDependencies.cs | 14 +++++++------- .../GivenThatIWantToMigrateDeprecatedProjects.cs | 16 ++++++++-------- .../GivenThatIWantANewAppWithSpecifiedType.cs | 10 +++++----- test/dotnet.Tests/PackagedCommandTests.cs | 2 +- 80 files changed, 172 insertions(+), 186 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index c8b5d990f..ba40187cd 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -7,7 +7,7 @@ $(PackageTargetFallback);portable-net45+win8;dnxcore50 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 $(CLI_SharedFrameworkVersion) - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj index 160921bae..9ab6d1e5a 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj @@ -4,7 +4,7 @@ AppWithRedirectsAndConfig Exe win7-x64;win7-x86 - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj index dd339afa3..aa1b27d15 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj @@ -4,7 +4,7 @@ AppWithRedirectsNoConfig Exe win7-x64;win7-x86 - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index b8d373889..aa1f26066 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -3,7 +3,7 @@ netstandard1.6;net451 Library $(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1 - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json b/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json index 1486a9d85..1fb29b170 100644 --- a/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json +++ b/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json @@ -11,9 +11,9 @@ } }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.App": "1.0.1" + "Microsoft.NETCore.App": "1.1.0" } }, "net451": {} diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj index 94b94db79..d705ebd65 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj @@ -1,11 +1,12 @@  + Exe netcoreapp1.0 dotnet-throwingtool $(AssemblyName) - 1.0.4 + $(CLI_SharedFrameworkVersion) diff --git a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj index 4029e9cbe..11553b268 100644 --- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj @@ -4,12 +4,9 @@ Exe netcoreapp2.0 + $(CLI_SharedFrameworkVersion) - - - - diff --git a/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json b/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json index b748d3b9f..98e6c1f8f 100644 --- a/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json index 666d644b9..060460e39 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json index 166d41c2b..a42ae0bb0 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json index 91b0a9ae6..be38f2878 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json @@ -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" } } diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json index b5feb4db5..788896dab 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json index b5feb4db5..788896dab 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json index ed61d9d34..ade45a814 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json @@ -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" } } diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json index 166d41c2b..a42ae0bb0 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json index 166d41c2b..a42ae0bb0 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json index 166d41c2b..a42ae0bb0 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json index 9f677856d..48cc4461c 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json index 87eeadaa3..abe2d6127 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json index 7418df38c..ce76b170c 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json index 3b457a6dc..caa91e887 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json index 5b1681989..721775e7f 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json index e0c6115f7..fce9b2e1a 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json index 5daf77a20..9590efb93 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json index 369f7325d..4851a858d 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json index d4f8ee07f..5bf7fe5f7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json index 01c3c9e23..87e1d0675 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json index a93ee629a..7de792cd3 100755 --- a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json +++ b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json @@ -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" diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json index 666d644b9..8edb9fd32 100644 --- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json +++ b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json index cd24d0e88..92c28da27 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json @@ -9,7 +9,7 @@ } }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": "dnxcore50" } } diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 793e4d3b3..eafa839b9 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -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" } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index d3946a98f..1717cd460 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -3,10 +3,12 @@ 1.0.0-rc - netcoreapp1.0 + netcoreapp1.1 dotnet-dependency-context-test Exe - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.1.1 + false @@ -16,7 +18,6 @@ - diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index 4e590ef5d..23df5a2ee 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -3,12 +3,13 @@ 1.0.0-rc - netcoreapp2.0 + netcoreapp1.1 dotnet-dependency-tool-invoker Exe $(PackageTargetFallback);portable-net45+win8;dnxcore50 - $(CLI_SharedFrameworkVersion) + 1.1.1 + false @@ -28,6 +29,7 @@ + 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 908965e3b..8a5096465 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -1,19 +1,15 @@  - + 1.0.0 - $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + netcoreapp2.0 + $(CLI_SharedFrameworkVersion) 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 + 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 - - - - 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 065c24d50..8f8164cef 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -1,19 +1,14 @@  - + 2.0.0 - $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + netcoreapp2.0 + $(CLI_SharedFrameworkVersion) 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 + 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 - - - - - diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 683f6c155..9b9f2fec9 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -1,10 +1,11 @@  - + - netcoreapp1.0 + netcoreapp2.0 Exe + $(CLI_SharedFrameworkVersion) @@ -17,9 +18,4 @@ \prefercliruntime - - - - - diff --git a/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json b/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json index 4779b862d..068194430 100644 --- a/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json +++ b/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json @@ -10,10 +10,10 @@ "System.Xml": {} } }, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NetCore.App": { - "version": "1.0.3", + "version": "1.1.0", "type": "platform" } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index fe9ce6357..f863c3161 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -8,11 +8,11 @@ } }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.0" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 9541e743a..2cfedcea8 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -4,11 +4,11 @@ }, "dependencies": {}, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.0" } } } diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/project.json b/TestAssets/TestProjects/AppWithAssemblyInfo/project.json index 9016d1324..dff934e8b 100644 --- a/TestAssets/TestProjects/AppWithAssemblyInfo/project.json +++ b/TestAssets/TestProjects/AppWithAssemblyInfo/project.json @@ -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" } } diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj index 9b8907373..4f189d465 100755 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj @@ -5,7 +5,7 @@ netcoreapp2.0 Exe $(CLI_SharedFrameworkVersion) - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 80d0ffd4b..db7004ecd 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -4,7 +4,7 @@ Exe net451;netcoreapp2.0 - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 2a4e3cc75..33eacba13 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -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": {}, diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json index 91b0a9ae6..be38f2878 100644 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json +++ b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json @@ -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" } } diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json index c9e71e7a1..510857461 100644 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json +++ b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json @@ -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" } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 225f497ad..909f6aa9f 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -7,13 +7,11 @@ DependencyContextFromTool Exe false - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(CLI_SharedFrameworkVersion) + netcoreapp1.1 - - - - diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 95347fe60..46c065472 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -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" } }, diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 67092b919..5c26acade 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -4,7 +4,7 @@ Exe net451;netcoreapp2.0 - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json b/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json index 2e09a4fd6..ebe6ac518 100644 --- a/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json @@ -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" } } diff --git a/TestAssets/TestProjects/PJTestAppSimple/project.json b/TestAssets/TestProjects/PJTestAppSimple/project.json index 5f8329deb..f94096150 100755 --- a/TestAssets/TestProjects/PJTestAppSimple/project.json +++ b/TestAssets/TestProjects/PJTestAppSimple/project.json @@ -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": {}, diff --git a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json index 10e7042d6..71dcdd6ed 100644 --- a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json +++ b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json @@ -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" diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json b/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json index 35b616f8a..e82212642 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json @@ -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", diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json index 7952dd345..89299337a 100644 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json +++ b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json @@ -11,10 +11,10 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.1" } }, "frameworks": { - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json index 7952dd345..003e499f1 100644 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json +++ b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json @@ -11,10 +11,10 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.0" } }, "frameworks": { - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json index de7f186e5..ab0e331eb 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json @@ -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": {}, diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json index 9608ee1d3..585da58f6 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json @@ -11,10 +11,10 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.0" } }, "frameworks": { - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json index 7952dd345..003e499f1 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json @@ -11,10 +11,10 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.0" } }, "frameworks": { - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json index 7952dd345..003e499f1 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json @@ -11,10 +11,10 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.1" + "version": "1.1.0" } }, "frameworks": { - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 5620a3bc3..b23cbdc8b 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -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" diff --git a/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json b/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json index 3c89bd6fb..4f97537d9 100755 --- a/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json +++ b/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json @@ -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" diff --git a/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json b/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json index c29a3797c..bd75d882b 100644 --- a/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json +++ b/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json @@ -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" diff --git a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json index 67a885251..56f3433fc 100644 --- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json +++ b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json @@ -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" diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 666d644b9..8edb9fd32 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -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": {}, diff --git a/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json index 419f935a3..a77fe2343 100644 --- a/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json @@ -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", diff --git a/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json b/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json index cc196a087..a453cbddb 100644 --- a/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json @@ -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": [ diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index 66c65a7ff..bedcf3da2 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -5,7 +5,7 @@ Exe netcoreapp2.0 $(CLI_SharedFrameworkVersion) - netcoreapp2.0 + netcoreapp1.1 diff --git a/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json b/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json index e7a052937..3727b2ece 100644 --- a/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json +++ b/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json @@ -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", diff --git a/TestAssets/TestProjects/TestAppWithSigning/project.json b/TestAssets/TestProjects/TestAppWithSigning/project.json index 93a9e4425..fa84e6e50 100644 --- a/TestAssets/TestProjects/TestAppWithSigning/project.json +++ b/TestAssets/TestProjects/TestAppWithSigning/project.json @@ -6,11 +6,11 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.1", + "version": "1.1.0", "type": "platform" }, }, "frameworks": { - "netcoreapp1.0": {} + "netcoreapp1.1": {} } } diff --git a/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json b/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json index 5287abb9b..1ff04d86a 100644 --- a/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json +++ b/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json @@ -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": {}, diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json index ea81ae848..f8e6d7db9 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json @@ -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", diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index a1758c4f1..a7d91de3d 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -16,10 +16,10 @@ - preview - 1.0.4 - 1.0.1 - 1.0.1 + release/1.1.0 + 1.1.1 + 1.1.0 + 1.1.0 dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) diff --git a/run-build.ps1 b/run-build.ps1 index b939b605f..c02a924cf 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -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" diff --git a/run-build.sh b/run-build.sh index 9c78a3827..5b65eeba4 100755 --- a/run-build.sh +++ b/run-build.sh @@ -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 $? diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index dde8ca364..602128a93 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -159,7 +159,7 @@ InputFile="$(VSTestRuntimeConfigPath)" DestinationFile="$(VSTestRuntimeConfigPath)" ReplacementPatterns="1.0.0" - ReplacementStrings="$(CLI_SharedFrameworkVersion)" /> + ReplacementStrings="1.1.1" /> Date: Thu, 9 Mar 2017 22:35:25 -0800 Subject: [PATCH 04/18] Added a comment for the bug tracking enabling F# in the 2.0 CLI. --- test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 4abf4782f..e732bcbac 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -23,6 +23,7 @@ namespace Microsoft.DotNet.New.Tests [InlineData("C#", "web", true)] [InlineData("C#", "mvc", true)] [InlineData("C#", "webapi", true)] + // Uncomment the test below once https://github.com/dotnet/netcorecli-fsc/issues/92 is fixed. //[InlineData("F#", "console", false)] //[InlineData("F#", "classlib", false)] //[InlineData("F#", "mstest", false)] From ec7c81ea84e83bba588d4ec50049ffa86ca9d1d9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 10 Mar 2017 17:11:32 -0800 Subject: [PATCH 05/18] Disabling intermittent test and fixing assets for windows only tests. --- .../DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj | 5 +---- .../dotnet-desktop-and-portable.csproj | 8 ++++---- .../AppWithDirectAndToolDep.csproj | 3 +++ .../TestProjects/AppWithDirectDep/AppWithDirectDep.csproj | 4 ++++ test/dotnet.Tests/PackagedCommandTests.cs | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index aa1f26066..51192f708 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -2,16 +2,13 @@ netstandard1.6;net451 Library - $(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1 + $(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp2.0 netcoreapp1.1 - - - 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 41585032e..1f3345bf4 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 @@ -3,20 +3,20 @@ 1.0.0-rc - netcoreapp2.0;net451 + netcoreapp1.1;net451 dotnet-desktop-and-portable Exe win7-x64;win7-x86 - + $(ProjectRuntimeConfigFilePath) - - $(CLI_SharedFrameworkVersion) + + 1.1.1 diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index dd88a2bfc..8795839bc 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -1,7 +1,10 @@  + + netcoreapp2.0 Exe + $(CLI_SharedFrameworkVersion) netcoreapp2.0 diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index 1cd74deae..0ca6ef86f 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -1,10 +1,14 @@  + + 1.0.0 netcoreapp2.0 AppWithDirectDep Exe false + $(CLI_SharedFrameworkVersion) + netcoreapp2.0 diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index 5e36bcbd8..b402f4e60 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -317,7 +317,7 @@ namespace Microsoft.DotNet.Tests stopWatch.ElapsedMilliseconds.Should().BeGreaterThan(1000, "Because dotnet should respect the NuGet lock"); } - [Fact] + [Fact(Skip="https://github.com/dotnet/cli/issues/6006")] public void WhenToolAssetsFileIsLockedByNuGetThenCLIRetriesLaunchingTheCommandForAtLeastOneSecond() { var testInstance = TestAssets.Get("AppWithToolDependency") From 421c7cb3b2f92c2774de76b0e8a666e05b01840c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Sat, 18 Mar 2017 09:59:41 -0700 Subject: [PATCH 06/18] Undoing hack to retarget vstest console now that it is no longer necessary and it targets 2.0. --- src/redist/redist.csproj | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 602128a93..7c7ef6569 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -150,18 +150,6 @@ AfterTargets="Publish"> - - - $(PublishDir)/vstest.console.runtimeconfig.json - - - - From c492e714e6a2f27dc54d37228d7522d868c92307 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 16 Mar 2017 17:28:10 -0500 Subject: [PATCH 07/18] Enable tests on linux portable build. --- netci.groovy | 6 +----- run-build.sh | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/netci.groovy b/netci.groovy index 374eaa962..4f60f0db8 100644 --- a/netci.groovy +++ b/netci.groovy @@ -60,11 +60,7 @@ platformList.each { platform -> Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto') Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - // Remove this check once tests work for 2.0. Until that time Linux portable tests will fail so we - // don't run the tests and there won't be any .trx file. - if (os != 'Linux') { - Utilities.addMSTestResults(newJob, '**/*.trx') - } + Utilities.addMSTestResults(newJob, '**/*.trx') Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") } diff --git a/run-build.sh b/run-build.sh index 11e4ff753..684fb8049 100755 --- a/run-build.sh +++ b/run-build.sh @@ -98,8 +98,7 @@ while [[ $# > 0 ]]; do ;; --linux-portable) LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64" - # Until we get test support for 2.0 we need to pass in the targets without test. - CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:CLITargets=\"Prepare;Compile;Package;Publish\"" + CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\"" args=( "${args[@]/$1}" ) ;; --help) From 8e239a482506d2c6edfde542dce4e64d1ff84b8b Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 16 Mar 2017 21:34:10 -0500 Subject: [PATCH 08/18] Clean up dead code These are old usages of GetRuntimeIdentifier() that are no longer needed. --- src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs | 11 ---- .../DotnetRuntimeIdentifiers.cs | 34 ------------ .../RuntimeEnvironmentRidExtensions.cs | 54 ------------------- .../StreamForwarderTests.cs | 2 - 4 files changed, 101 deletions(-) delete mode 100644 src/Microsoft.DotNet.Cli.Utils/DotnetRuntimeIdentifiers.cs diff --git a/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs index d4212fb6a..3a5accdfb 100644 --- a/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs +++ b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs @@ -25,16 +25,5 @@ namespace Microsoft.DotNet.Cli { get { return s_versionFileObject.Value; } } - - /// - /// Reads the version file and adds runtime specific information - /// - public static string ReadAndInterpretVersionFile() - { - var content = File.ReadAllText(DotnetFiles.VersionFile); - content += Environment.NewLine; - content += RuntimeEnvironment.GetRuntimeIdentifier(); - return content; - } } } diff --git a/src/Microsoft.DotNet.Cli.Utils/DotnetRuntimeIdentifiers.cs b/src/Microsoft.DotNet.Cli.Utils/DotnetRuntimeIdentifiers.cs deleted file mode 100644 index 747fa8901..000000000 --- a/src/Microsoft.DotNet.Cli.Utils/DotnetRuntimeIdentifiers.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.Collections.Generic; - -namespace Microsoft.DotNet.Cli.Utils -{ - internal static class DotnetRuntimeIdentifiers - { - public static IEnumerable InferCurrentRuntimeIdentifiers(DotnetVersionFile versionFile) - { - IEnumerable fallbackIdentifiers = null; - - // If the machine's RID isn't supported by the shared framework (i.e. the CLI - // is being used on a newer version of an OS), add the RID that the CLI was built - // with as a fallback. The RID the CLI was built with will have the correct - // runtime.* NuGet packages available. - // For example, when a user is using osx.10.12, but we only support osx.10.10 and - // osx.10.11, the project.json "runtimes" section cannot contain osx.10.12, since - // that RID isn't contained in the runtime graph - users will get a restore error. - FrameworkDependencyFile fxDepsFile = new FrameworkDependencyFile(); - if (!fxDepsFile.SupportsCurrentRuntime()) - { - string buildRid = versionFile.BuildRid; - if (!string.IsNullOrEmpty(buildRid)) - { - fallbackIdentifiers = new string[] { buildRid }; - } - } - - return RuntimeEnvironmentRidExtensions.GetAllCandidateRuntimeIdentifiers(fallbackIdentifiers); - } - } -} diff --git a/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs b/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs index 1d695a5de..b758f047e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs +++ b/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs @@ -29,59 +29,5 @@ namespace Microsoft.DotNet.Cli.Utils return "win7-" + arch; } } - - public static IEnumerable GetAllCandidateRuntimeIdentifiers() - { - return GetAllCandidateRuntimeIdentifiers(null); - } - - public static IEnumerable GetAllCandidateRuntimeIdentifiers(IEnumerable fallbackIdentifiers = null) - { - List result = new List(); - - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) - { - result.Add(RuntimeEnvironment.GetRuntimeIdentifier()); - } - else - { - var arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant(); - if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.1", StringComparison.Ordinal)) - { - result.Add("win7-" + arch); - } - else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.2", StringComparison.Ordinal)) - { - result.Add("win8-" + arch); - result.Add("win7-" + arch); - } - else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.3", StringComparison.Ordinal)) - { - result.Add("win81-" + arch); - result.Add("win8-" + arch); - result.Add("win7-" + arch); - } - else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("10.0", StringComparison.Ordinal)) - { - result.Add("win10-" + arch); - result.Add("win81-" + arch); - result.Add("win8-" + arch); - result.Add("win7-" + arch); - } - } - - if (fallbackIdentifiers != null) - { - foreach (string fallbackIdentifier in fallbackIdentifiers) - { - if (!result.Contains(fallbackIdentifier)) - { - result.Add(fallbackIdentifier); - } - } - } - - return result; - } } } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs index 0ec85046c..b0b825e43 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs @@ -13,8 +13,6 @@ namespace StreamForwarderTests { public class StreamForwarderTests : TestBase { - private static readonly string s_rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - public static IEnumerable ForwardingTheoryVariations { get From 4fc2e8e19addeeb8e73639969bca5095591f278a Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 16 Mar 2017 22:26:26 -0500 Subject: [PATCH 09/18] Read artifacts rid from BuildInfo.props --- .../RepoDirectoriesProvider.cs | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index 0b634cd79..fea10a4ce 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Linq; +using System.Xml.Linq; using Microsoft.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Tools.Test.Utilities @@ -11,6 +12,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities public class RepoDirectoriesProvider { private static string s_repoRoot; + private static string s_buildRid; private string _artifacts; private string _builtDotnet; @@ -49,6 +51,32 @@ namespace Microsoft.DotNet.Tools.Test.Utilities } } + private static string BuildRid + { + get + { + if (string.IsNullOrEmpty(s_buildRid)) + { + var buildInfoPath = Path.Combine(RepoRoot, "artifacts", "obj", "BuildInfo.props"); + var root = XDocument.Load(buildInfoPath).Root; + var ns = root.Name.Namespace; + + s_buildRid = root + .Elements(ns + "PropertyGroup") + .Elements(ns + "Rid") + .FirstOrDefault() + ?.Value; + + if (string.IsNullOrEmpty(s_buildRid)) + { + throw new InvalidOperationException($"Could not find a property named 'Rid' in {buildInfoPath}"); + } + } + + return s_buildRid; + } + } + public string Artifacts => _artifacts; public string BuiltDotnet => _builtDotnet; public string NugetPackages => _nugetPackages; @@ -64,9 +92,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities string corehostDummyPackages = null, string pjDotnet = null) { - var currentRid = RuntimeEnvironment.GetRuntimeIdentifier(); - - _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", currentRid); + _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", BuildRid); _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish"); _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages"); _pjDotnet = pjDotnet ?? GetPjDotnetPath(); From bd58bcf03ba62ef25602fd4b4c07c017990d4d56 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 20 Mar 2017 11:32:49 -0500 Subject: [PATCH 10/18] Disable F# tests on linux-x64. linux-x64 only has .NET Core 2.0, but F# requires .NET Core 1.0 runtime. --- .../EnvironmentInfo.cs | 14 +++++++++++--- .../RepoDirectoriesProvider.cs | 2 +- .../GivenThatIWantANewAppWithSpecifiedType.cs | 7 +++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs index a99c8ef60..2f50d2e4e 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs @@ -1,22 +1,30 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.PlatformAbstractions; - namespace Microsoft.DotNet.Tools.Test.Utilities { public static class EnvironmentInfo { public static bool HasSharedFramework(string framework) { + string rid = RepoDirectoriesProvider.BuildRid; + if (framework == "netcoreapp1.0") { - string rid = RuntimeEnvironment.GetRuntimeIdentifier(); switch (rid) { case "fedora.24-x64": case "opensuse.42.1-x64": case "ubuntu.16.10-x64": + case "linux-x64": + return false; + } + } + else if (framework == "netcoreapp1.1") + { + switch (rid) + { + case "linux-x64": return false; } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index fea10a4ce..94586477f 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities } } - private static string BuildRid + public static string BuildRid { get { diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index e732bcbac..3859aa435 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -34,6 +34,13 @@ namespace Microsoft.DotNet.New.Tests string projectType, bool useNuGetConfigForAspNet) { + if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) + { + // F# requires netcoreapp1.0 to be present in order to build + // https://github.com/dotnet/netcorecli-fsc/issues/76 + return; + } + string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; new TestCommand("dotnet") { WorkingDirectory = rootPath } From df496d0959c2a212970e34da223c147e23e9c2e1 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 20 Mar 2017 12:41:47 -0700 Subject: [PATCH 11/18] Fixing the extra distros. --- build.proj | 2 +- build/BuildDefaults.props | 5 +---- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 3 +-- tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.proj b/build.proj index 9f7894c3f..066001333 100644 --- a/build.proj +++ b/build.proj @@ -20,7 +20,7 @@ DependsOnTargets="MSBuildWorkaroundTarget; RestoreDotnetCliBuildFramework"> - diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index bbf51f97b..463e421fc 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -2,10 +2,7 @@ Prepare;Compile;Test;Package;Publish Debug - true + true true false true diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 5e6cddc3c..952ebb548 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -3,7 +3,7 @@ Build scripts for dotnet-cli 1.0.0 - netcoreapp1.0 + $(CliTargetFramework) true bin\$(Configuration) $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 @@ -18,7 +18,6 @@ - diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index fc4d473dd..d8d6820fb 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -3,7 +3,7 @@ netcoreapp2.0 - linux-x64;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;osx.10.10-x64;rhel.7-x64 + 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 From 98a55251e7b3147950ddfd964d5fd8d14717f42c Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 20 Mar 2017 16:13:45 -0400 Subject: [PATCH 12/18] Fix markdown headings to work with github's new rendering Recent changes to github now require a space after '#' for headings in markdown documents to work correctly. See: https://github.github.com/gfm/#atx-headings --- Documentation/project-docs/developer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/project-docs/developer-guide.md b/Documentation/project-docs/developer-guide.md index 775a43641..a9fae98c0 100644 --- a/Documentation/project-docs/developer-guide.md +++ b/Documentation/project-docs/developer-guide.md @@ -44,7 +44,7 @@ Using the `dotnet` built in the previous step: 1. To run all tests invoke `build.cmd` or `build.sh` which will build the product and run the tests. 2. To run a specific test, cd into that test's directory and execute `dotnet test`. If using this approach, make sure to add `artifacts/{RID}/stage2` to your `PATH` and set the `NUGET_PACKAGES` environment variable to point to the repo's `.nuget/packages` directory. -##Adding a Command +## Adding a Command The dotnet CLI supports several models for adding new commands: From 9b436698621a9f1f6cd5dce968d7423631b40ba9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 20 Mar 2017 13:43:41 -0700 Subject: [PATCH 13/18] Add linux x64 back to the rids list of crossgen tools. --- tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index d8d6820fb..12b809970 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -3,7 +3,7 @@ netcoreapp2.0 - 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 + linux-x64;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 From ff294c312ac39ab369256eb286fbc093a33f1059 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 20 Mar 2017 14:37:29 -0700 Subject: [PATCH 14/18] Fixing the moniker for the new rids. --- build/Branding.props | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/Branding.props b/build/Branding.props index 935355a02..83241f0bb 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -12,7 +12,10 @@ Microsoft.NETCore.App $(SharedFrameworkName) - $(Rid) + $(Rid) $(OSName)-$(Architecture) dotnet-sdk From a9082e56fb258342f8a89959701b718b0c1877bc Mon Sep 17 00:00:00 2001 From: Ken Dale Date: Mon, 20 Mar 2017 18:09:21 -0400 Subject: [PATCH 15/18] Fix README.md table --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03a888c99..5d1b4ffa6 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > want to install the latest released versions, please check out the [section above](#download-links).) | Platform | master
[![][version-badge]][version] | -|----------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| +| -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | | **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] | From a5e0b35b97e7d71d54d9cccf06535950cff8dd27 Mon Sep 17 00:00:00 2001 From: Petr Onderka Date: Fri, 10 Mar 2017 14:01:47 +0100 Subject: [PATCH 16/18] Fixed section link to latest released version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d1b4ffa6..081b9871c 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ You can download .NET Core SDK as either an installer (MSI, PKG) or a zip (zip, In order to download just the .NET Core runtime without the SDK, please visit https://github.com/dotnet/core-setup#daily-builds. > **Note:** please be aware that below installers are the **latest bits**. If you -> want to install the latest released versions, please check out the [section above](#download-links).) +> want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). | Platform | master
[![][version-badge]][version] | | -------- | :-------------------------------------: | From a48f3a6bbff4a818f13255b739d67ce2684d10bf Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Mon, 20 Mar 2017 18:06:48 -0700 Subject: [PATCH 17/18] Using Apphost.exe for standalone apps --- build/DependencyVersions.props | 2 +- src/dotnet/commands/dotnet-cache/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a5c1e8c0f..30cbb6510 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.0-beta-001791-00 15.2.0-preview-000047-02 2.0.0-rc4-61325-08 - 1.1.0-alpha-20170306-2 + 2.0.0-alpha-20170320-1 4.3.0-beta1-2342 1.0.0-alpha-20170130-3-281 15.1.0-preview-20170316-05 diff --git a/src/dotnet/commands/dotnet-cache/Program.cs b/src/dotnet/commands/dotnet-cache/Program.cs index 4bd7ee8db..94684ceee 100644 --- a/src/dotnet/commands/dotnet-cache/Program.cs +++ b/src/dotnet/commands/dotnet-cache/Program.cs @@ -103,7 +103,7 @@ namespace Microsoft.DotNet.Tools.Cache if (!string.IsNullOrEmpty(fxOption.Value())) { - msbuildArgs.Add($"/p:FX_Version={fxOption.Value()}"); + msbuildArgs.Add($"/p:RuntimeFrameworkVersion={fxOption.Value()}"); } if (!string.IsNullOrEmpty(workingDir.Value())) From 5194735e27a91b983b61f41b53951d382c8aff52 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 20 Mar 2017 21:02:56 -0500 Subject: [PATCH 18/18] Disable cli tool tests on linux-x64 that require netcoreapp1.1. --- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +- test/dotnet.Tests/PackagedCommandTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index f51c2d82a..993115b10 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -89,7 +89,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd .And.HaveStdOutContaining("Hello I prefer the cli runtime World!");; } - [Fact] + [RequiresSpecificFrameworkFact("netcoreapp1.1")] // https://github.com/dotnet/cli/issues/6087 public void ItCanRunAToolThatInvokesADependencyToolInACSProj() { var repoDirectoriesProvider = new RepoDirectoriesProvider(); diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index b402f4e60..79e1604c5 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Tests .And.Pass(); } - [Fact] + [RequiresSpecificFrameworkFact("netcoreapp1.1")] // https://github.com/dotnet/cli/issues/6087 public void CanInvokeToolFromDirectDependenciesIfPackageNameDifferentFromToolName() { var testInstance = TestAssets.Get("AppWithDirectDepWithOutputName") @@ -242,7 +242,7 @@ namespace Microsoft.DotNet.Tests .Should().Fail(); } - [Fact] + [RequiresSpecificFrameworkFact("netcoreapp1.1")] // https://github.com/dotnet/cli/issues/6087 public void ToolsCanAccessDependencyContextProperly() { var testInstance = TestAssets.Get("DependencyContextFromTool")