From 3e2a16d5dbf9bbaeea74c455afac208976a385f8 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 5 Jul 2018 18:00:56 -0700 Subject: [PATCH 01/13] Insert .NET Core 3.0 runtime builds --- Directory.Build.props | 6 +++--- build/DependencyVersions.props | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 74d64c8aa..9c3a0921d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -29,9 +29,9 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj true true - netcoreapp2.2 - - 2.2 + netcoreapp3.0 + + 3.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index bd18061d5..b5dafa993 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -5,7 +5,7 @@ 2.2.100-refac-009032 2.2.0-preview1-34355 $(MicrosoftAspNetCoreAllPackageVersion) - 2.2.0-preview1-26529-01 + 3.0.0-preview1-26627-03 $(MicrosoftNETCoreAppPackageVersion) 15.8.0-preview-000060 $(MicrosoftBuildPackageVersion) @@ -13,7 +13,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180515-0 - 2.8.1-beta6-62915-07 + 2.8.3-beta6-63026-16 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -32,8 +32,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.2.0-preview1-26508-01 - 2.2.0-preview1-26508-01 + 3.0.0-preview1-26627-03 + 3.0.0-preview1-26627-03 0.1.1-rtm-62915-03 1.3.1-rtm-62915-03 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) From c6925a53886ce73ecbea6f363ad3d2419b1d5b06 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 5 Jul 2018 18:01:24 -0700 Subject: [PATCH 02/13] Add dotnet-buildtools feed for Microsoft.DotNet.VersionTools --- build/NugetConfigFile.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 87b6a0123..55d71f277 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -22,6 +22,7 @@ + From ec9914424c6fb9fe89e777267ec65b6ef44e3cfc Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 6 Jul 2018 15:15:46 -0700 Subject: [PATCH 03/13] Refactor tests to use CliTargetFramework variable instead of hard-coding target framework --- Directory.Build.props | 5 +---- .../dotnet-dependency-tool-invoker.csproj | 2 +- .../TestPackages/dotnet-portable/dotnet-portable.csproj | 2 +- .../dotnet-prefercliruntime/dotnet-prefercliruntime.csproj | 2 +- .../AppWithApplicationUrlInLaunchSettings.csproj | 2 +- .../TestProjects/MSBuildTestApp/MSBuildTestApp.csproj | 2 +- .../TestAppWithProjDepTool/TestAppWithProjDepTool.csproj | 2 +- .../TestProjects/TestWebAppSimple/TestWebAppSimple.csproj | 2 +- build/TargetFramework.props | 7 +++++++ testAsset.props | 1 + tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj | 2 +- 11 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 build/TargetFramework.props diff --git a/Directory.Build.props b/Directory.Build.props index 9c3a0921d..5f6c9bd6f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,12 +28,9 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj true true - - netcoreapp3.0 - - 3.0 + 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 9b3a4e233..758e81ed5 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,7 +3,7 @@ 1.0.0-rc - netcoreapp2.2 + $(CliTargetFramework) Exe diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj index 1aef6a2d9..f707001e8 100644 --- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj +++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj @@ -2,7 +2,7 @@ - netcoreapp2.2 + $(CliTargetFramework) Exe diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 8706fd623..c97da18f4 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -2,7 +2,7 @@ - netcoreapp2.2 + $(CliTargetFramework) Exe diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj index 576839f8e..8ef0c8c1b 100644 --- a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj @@ -3,6 +3,6 @@ Exe - netcoreapp2.2 + $(CliTargetFramework) diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 89540778e..a095969a6 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.2 + $(CliTargetFramework) win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 $(TEST_PACKAGES) diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index 71c0021d7..d05c83d53 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.2 + $(CliTargetFramework) $(TEST_PACKAGES) diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj index 0d5ffc364..a6a28607a 100644 --- a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj +++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj @@ -2,7 +2,7 @@ - netcoreapp2.2 + $(CliTargetFramework) diff --git a/build/TargetFramework.props b/build/TargetFramework.props new file mode 100644 index 000000000..ca28c4c38 --- /dev/null +++ b/build/TargetFramework.props @@ -0,0 +1,7 @@ + + + netcoreapp3.0 + + 3.0 + + diff --git a/testAsset.props b/testAsset.props index 8d003d8ab..1a10b582d 100644 --- a/testAsset.props +++ b/testAsset.props @@ -2,6 +2,7 @@ $(MSBuildThisFileDirectory) + diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index 0ca594efa..6cf680998 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -1,6 +1,6 @@  - netcoreapp2.2 + $(CliTargetFramework) $(SharedFrameworkRid) From b3be19b8209db7e20a3f6c504a41b46df82309c6 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 6 Jul 2018 17:56:42 -0700 Subject: [PATCH 04/13] Fix up runtimeconfig.json files for tools (dotnet, MSBuild, VSTest, etc) to target .NET Core 3.0 --- src/redist/redist.csproj | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 92ee7d8f6..ee0e506b6 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -25,7 +25,7 @@ PublishDotnetTools; PublishVersionFile; PublishAppHostTemplate; - RetargetVSTestConsole; + RetargetTools; GenerateMSBuildExtensions" AfterTargets="Publish" /> @@ -258,15 +258,17 @@ DependsOnTargets="GetNuGetPackagesArchive"> - + - $(PublishDir)/vstest.console.runtimeconfig.json "version": ".*" "version": "$(MicrosoftNETCoreAppPackageVersion)" + + + From c431d58b720c8a65dc032503d27188b291329a0f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 6 Jul 2018 17:57:16 -0700 Subject: [PATCH 05/13] Set maximum .NET Core version to 3.0 in BundledVersions.props --- build/MSBuildExtensions.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 46251b602..45f875c95 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -77,6 +77,7 @@ Copyright (c) .NET Foundation. All rights reserved. --> + $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) $(_NETStandardTargetFrameworkVersion) From 21fec561ee56a014ce592572710abab4212dabd7 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 6 Jul 2018 17:58:09 -0700 Subject: [PATCH 06/13] Update dev and test script window titles to new repo name --- scripts/cli-build-env.bat | 2 +- scripts/cli-test-env.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cli-build-env.bat b/scripts/cli-build-env.bat index 03b6ded6f..ff643c625 100644 --- a/scripts/cli-build-env.bat +++ b/scripts/cli-build-env.bat @@ -7,7 +7,7 @@ for %%i in (%~dp0..\) DO ( SET CLI_REPO_ROOT=%%~dpi ) -title CLI Build (%CLI_REPO_ROOT%) +title Core-SDK Build (%CLI_REPO_ROOT%) REM Add Stage 0 CLI to path set PATH=%CLI_REPO_ROOT%.dotnet_stage0\x64;%PATH% diff --git a/scripts/cli-test-env.bat b/scripts/cli-test-env.bat index 0fd84c053..8a99d3514 100644 --- a/scripts/cli-test-env.bat +++ b/scripts/cli-test-env.bat @@ -7,7 +7,7 @@ for %%i in (%~dp0..\) DO ( SET CLI_REPO_ROOT=%%~dpi ) -title CLI Test (%CLI_REPO_ROOT%) +title Core SDK Test (%CLI_REPO_ROOT%) REM Add Stage 2 CLI to path set PATH=%CLI_REPO_ROOT%bin\2\win-x64\dotnet;%PATH% From cf0441cf6e0706424c6bf1a024cd3268b1bb0165 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 6 Jul 2018 17:58:44 -0700 Subject: [PATCH 07/13] Update test to target .NET Core 3.0 --- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 18 ++++++-- test/Microsoft.DotNet.Cli.Tests.sln | 60 ++++++++++++------------- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index f5def1d95..8a7e26c41 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -3,6 +3,8 @@ using System; using System.IO; +using System.Linq; +using System.Xml.Linq; using Microsoft.DotNet.Tools.Test.Utilities; using Xunit; @@ -19,12 +21,22 @@ namespace Microsoft.DotNet.Tests.EndToEnd { string projectDirectory = directory.Path; - string newArgs = "console -f netcoreapp2.1 --debug:ephemeral-hive --no-restore"; + string newArgs = "console --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) .Should().Pass(); + string projectPath = Directory.GetFiles(projectDirectory, "*.csproj").Single(); + + // Override TargetFramework since there aren't .NET Core 3 templates yet + XDocument project = XDocument.Load(projectPath); + var ns = project.Root.Name.Namespace; + project.Root.Element(ns + "PropertyGroup") + .Element(ns + "TargetFramework") + .Value = "netcoreapp3.0"; + project.Save(projectPath); + new RestoreCommand() .WithWorkingDirectory(projectDirectory) .Execute("/p:SkipInvalidConfigurations=true") @@ -65,7 +77,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd new DotnetCommand() .WithWorkingDirectory(testInstance.Root) - .ExecuteWithCapturedOutput("portable") + .ExecuteWithCapturedOutput("-d portable") .Should() .Pass() .And @@ -84,7 +96,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd new DotnetCommand() .WithWorkingDirectory(testInstance.Root) - .ExecuteWithCapturedOutput("prefercliruntime") + .ExecuteWithCapturedOutput("-d prefercliruntime") .Should().Pass() .And.HaveStdOutContaining("Hello I prefer the cli runtime World!");; } diff --git a/test/Microsoft.DotNet.Cli.Tests.sln b/test/Microsoft.DotNet.Cli.Tests.sln index 6c9ab9014..d269ba06b 100644 --- a/test/Microsoft.DotNet.Cli.Tests.sln +++ b/test/Microsoft.DotNet.Cli.Tests.sln @@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.TestFramework", "Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{BEA33DFA-8559-4680-B40A-B522FBF37567}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramework", "Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{BEA33DFA-8559-4680-B40A-B522FBF37567}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Tools.Tests.Utilities", "Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{770FE8B9-6381-4328-AA36-D6A21114701E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{770FE8B9-6381-4328-AA36-D6A21114701E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd", "EndToEnd\EndToEnd.csproj", "{AEB7B217-D4C4-46F1-9495-87F869F0ABE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd", "EndToEnd\EndToEnd.csproj", "{AEB7B217-D4C4-46F1-9495-87F869F0ABE4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,46 +17,46 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x64.ActiveCfg = Debug|x64 - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x64.Build.0 = Debug|x64 - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x86.ActiveCfg = Debug|x86 - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x86.Build.0 = Debug|x86 + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x64.ActiveCfg = Debug|Any CPU + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x64.Build.0 = Debug|Any CPU + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x86.ActiveCfg = Debug|Any CPU + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Debug|x86.Build.0 = Debug|Any CPU {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|Any CPU.ActiveCfg = Release|Any CPU {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|Any CPU.Build.0 = Release|Any CPU - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x64.ActiveCfg = Release|x64 - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x64.Build.0 = Release|x64 - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x86.ActiveCfg = Release|x86 - {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x86.Build.0 = Release|x86 + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x64.ActiveCfg = Release|Any CPU + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x64.Build.0 = Release|Any CPU + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x86.ActiveCfg = Release|Any CPU + {BEA33DFA-8559-4680-B40A-B522FBF37567}.Release|x86.Build.0 = Release|Any CPU {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x64.ActiveCfg = Debug|x64 - {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x64.Build.0 = Debug|x64 - {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x86.ActiveCfg = Debug|x86 - {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x86.Build.0 = Debug|x86 + {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x64.ActiveCfg = Debug|Any CPU + {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x64.Build.0 = Debug|Any CPU + {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x86.ActiveCfg = Debug|Any CPU + {770FE8B9-6381-4328-AA36-D6A21114701E}.Debug|x86.Build.0 = Debug|Any CPU {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|Any CPU.ActiveCfg = Release|Any CPU {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|Any CPU.Build.0 = Release|Any CPU - {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x64.ActiveCfg = Release|x64 - {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x64.Build.0 = Release|x64 - {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x86.ActiveCfg = Release|x86 - {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x86.Build.0 = Release|x86 + {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x64.ActiveCfg = Release|Any CPU + {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x64.Build.0 = Release|Any CPU + {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x86.ActiveCfg = Release|Any CPU + {770FE8B9-6381-4328-AA36-D6A21114701E}.Release|x86.Build.0 = Release|Any CPU {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x64.ActiveCfg = Debug|x64 - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x64.Build.0 = Debug|x64 - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x86.ActiveCfg = Debug|x86 - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x86.Build.0 = Debug|x86 + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x64.ActiveCfg = Debug|Any CPU + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x64.Build.0 = Debug|Any CPU + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x86.ActiveCfg = Debug|Any CPU + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Debug|x86.Build.0 = Debug|Any CPU {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|Any CPU.ActiveCfg = Release|Any CPU {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|Any CPU.Build.0 = Release|Any CPU - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x64.ActiveCfg = Release|x64 - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x64.Build.0 = Release|x64 - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x86.ActiveCfg = Release|x86 - {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x86.Build.0 = Release|x86 + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x64.ActiveCfg = Release|Any CPU + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x64.Build.0 = Release|Any CPU + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x86.ActiveCfg = Release|Any CPU + {AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7AF6777A-0133-453A-B302-FDD974B8F39C} From 75e0dbb45d7cadea5477da99d077db05753bd171 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 9 Jul 2018 10:25:13 -0700 Subject: [PATCH 08/13] Update tests for .NET Core 3.0 --- .../GivenAspNetAppsResolveImplicitVersions.cs | 13 +++++---- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +- .../GivenSelfContainedAppsRollForward.cs | 29 ++++++++++++++----- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs index da7163646..9e3850e74 100644 --- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs +++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs @@ -16,7 +16,7 @@ namespace EndToEnd { private const string AspNetTestProject = "TestWebAppSimple"; - [Fact] + [Fact(Skip ="https://github.com/dotnet/core-sdk/issues/21")] public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() { var _testInstance = TestAssets.Get(AspNetTestProject) @@ -56,7 +56,7 @@ namespace EndToEnd "Please update MSBuildExtensions.targets in this repo so these versions match."); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/core-sdk/issues/21")] public void StandalonePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() { var _testInstance = TestAssets.Get(AspNetTestProject) @@ -102,7 +102,7 @@ namespace EndToEnd "Please update MSBuildExtensions.targets in this repo so these versions match."); } - [Theory] + [Theory(Skip = "https://github.com/dotnet/core-sdk/issues/21")] [MemberData(nameof(SupportedAspNetCoreAppVersions))] public void ItRollsForwardToTheLatestVersion(string minorVersion) { @@ -172,7 +172,7 @@ namespace EndToEnd "(see MSBuildExtensions.targets in this repo)"); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/core-sdk/issues/21")] public void WeCoverLatestAspNetCoreAppRollForward() { // Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions @@ -209,12 +209,15 @@ namespace EndToEnd ?.Version; } - public static string LatestSupportedAspNetCoreAppVersion = "2.2"; + public static string LatestSupportedAspNetCoreAppVersion = "3.0"; public static IEnumerable SupportedAspNetCoreAppVersions { get { + yield return new object[] { "2.1" }; + // 2.2 not yet stable + //yield return new object[] { "2.2" }; yield return new object[] { LatestSupportedAspNetCoreAppVersion }; } } diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index 8a7e26c41..2aeabc9d4 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -124,7 +124,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd new DotnetCommand() .WithWorkingDirectory(testProjectDirectory) .ExecuteWithCapturedOutput( - $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.2 portable") + $"-d dependency-tool-invoker -c {configuration} -f netcoreapp3.0 portable") .Should().Pass() .And.HaveStdOutContaining("Hello Portable World!");; } diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 080197472..192b968b2 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Xml.Linq; using FluentAssertions; @@ -129,13 +130,27 @@ namespace EndToEnd { get { - return new[] - { - "1.0", - "1.1", - "2.0", - "2.1" - }.Select(version => new object[] { version }); + + var versions = new List(); + + // Runtime 1.x deosn't support openSUSE and Fedora 27, so skip testing those versions on Linux + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + versions.AddRange(new[] + { + "1.0", + "1.1", + }); + } + + versions.AddRange(new[] + { + "2.0", + "2.1", + "3.0" + }); + + return versions.Select(version => new object[] { version }); } } } From 905d4d442d736c14f39fc05b8991b0ba4c977662 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 9 Jul 2018 14:12:11 -0700 Subject: [PATCH 09/13] Address code review feedback --- build/TargetFramework.props | 4 +++- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/TargetFramework.props b/build/TargetFramework.props index ca28c4c38..2bfa25b66 100644 --- a/build/TargetFramework.props +++ b/build/TargetFramework.props @@ -1,7 +1,9 @@ netcoreapp3.0 - + + 3.0 diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index 2aeabc9d4..2b05328f6 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -30,6 +30,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd string projectPath = Directory.GetFiles(projectDirectory, "*.csproj").Single(); // Override TargetFramework since there aren't .NET Core 3 templates yet + // https://github.com/dotnet/core-sdk/issues/24 tracks removing this workaround XDocument project = XDocument.Load(projectPath); var ns = project.Root.Name.Namespace; project.Root.Element(ns + "PropertyGroup") From 2c8a349bd154b3e7c0324bc027eeb64373afdb6f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 9 Jul 2018 16:38:12 -0700 Subject: [PATCH 10/13] Generate .binlog on non-Windows --- run-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-build.sh b/run-build.sh index 3c08dc14e..a87710eae 100755 --- a/run-build.sh +++ b/run-build.sh @@ -190,7 +190,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 if [ $BUILD -eq 1 ]; then dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles ${argsnotargets[@]} - dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args + dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /bl /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args else echo "Not building due to --nobuild" echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args'" From b44a2bb723a1ea7c7a28504a3fbe79182c0dee07 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 9 Jul 2018 18:05:56 -0700 Subject: [PATCH 11/13] Insert ASP.NET Core 3.0 --- build/BundledTemplates.props | 2 +- build/DependencyVersions.props | 2 +- build/package/Installer.DEB.proj | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index e1cb85a8f..3dc796a21 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -5,7 +5,7 @@ - + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b5dafa993..e10fdc082 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.2.100-preview1-008982 2.2.100-refac-009032 - 2.2.0-preview1-34355 + 3.0.0-alpha1-10049 $(MicrosoftAspNetCoreAllPackageVersion) 3.0.0-preview1-26627-03 $(MicrosoftNETCoreAppPackageVersion) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 0e516f440..9a25f7ff1 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -15,8 +15,12 @@ - - --ignore-depends=dotnet-runtime-$(AspNetCoreSharedFxBaseRuntimeVersion) + $(AspNetCoreSharedFxBaseRuntimeVersion.IndexOf('-')) + $(AspNetCoreSharedFxBaseRuntimeVersion) + $(AspNetCoreSharedFxBaseRuntimeVersion.Substring(0, $(AspNetVersionPrereleaseSeparator))) + + + --ignore-depends=dotnet-runtime-$(AspNetSimpleVersion) From 73ec338775844b5460943e7c2d61a8b772e0a8f4 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 11 Jul 2018 14:36:19 -0700 Subject: [PATCH 12/13] Remove -upgrade suffix from deb and rpm installer filenames --- build/BundledRuntimes.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 7276b8b70..2de7068b0 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -6,9 +6,6 @@ -internal - - -upgrade - dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerEndSuffix)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName) From cf4a81a58381a156b65343dfc0d0febbb4fea666 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 11 Jul 2018 17:27:46 -0700 Subject: [PATCH 13/13] Temporarily disable creating Debian packages https://github.com/dotnet/core-sdk/issues/27 --- build/package/Installer.DEB.proj | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 9a25f7ff1..a95d886a6 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -5,11 +5,17 @@ + +