From bedf79f444289f3caabb836055e1faa7d28c596b Mon Sep 17 00:00:00 2001 From: Mayank Bansal Date: Thu, 22 Mar 2018 14:25:38 +0530 Subject: [PATCH 01/60] [WIP]TestPlatform 15.7 preview 3 insertion --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 745bdee58..58b55035b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -40,7 +40,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.7.0-preview-20180221-13 + 15.7.0-preview-20180320-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From c4cae059a957b4cfe71b724fa3233f72f7d080e6 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Tue, 20 Mar 2018 15:17:40 -0700 Subject: [PATCH 02/60] MSBuild 15.7.108 * Add feed to msbuild myget * Update MSBuild to 15.7.108 (contains both netcoreapp2.0 and netcoreapp2.1) --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 745bdee58..20f0187ca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.6.82 + 15.7.0-preview-000108 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 10d4f8b23..a272ecb86 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -32,7 +32,7 @@ - + ]]> From 8d7009cb83069fbe0310edcb9aa19440a4934fb8 Mon Sep 17 00:00:00 2001 From: Jeff Kluge Date: Tue, 27 Feb 2018 13:59:59 -0800 Subject: [PATCH 03/60] Move some projects to netstandard2.0 (#8692) * Move some projects to netstandard2.0 * Use version agnostic $(TargetFrameworkIdentifier) property to make changing versions easier since we only care about .NET Framework vs .NET Standard * Add missing project to solution file * Update TestPackageProjects.targets to use netstandard2.0 on non-Windows --- build/test/TestPackageProjects.targets | 2 +- .../Microsoft.DotNet.Cli.Sln.Internal.csproj | 4 ++-- .../Microsoft.DotNet.Cli.Utils.csproj | 9 +++++---- .../Microsoft.DotNet.Configurer.csproj | 2 +- .../Microsoft.DotNet.InternalAbstractions.csproj | 2 +- .../Interop.NETStandard.cs | 6 +++--- .../MSBuildSdkResolver.cs | 2 +- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 15 ++++++++++----- .../Microsoft.DotNet.TestFramework.csproj | 3 ++- src/dotnet/dotnet.csproj | 2 +- .../Microsoft.DotNet.Cli.Msi.Tests.csproj | 2 +- ...crosoft.DotNet.MSBuildSdkResolver.Tests.csproj | 2 +- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 4 ++-- 13 files changed, 31 insertions(+), 24 deletions(-) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index fea46690c..bb280358a 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -39,7 +39,7 @@ $(CliVersionPrefix) $(VersionSuffix) False - /p:TargetFramework=netstandard1.5 + /p:TargetFramework=netstandard2.0 Microsoft.DotNet.InternalAbstractions diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 518040d30..b75274e65 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -4,7 +4,7 @@ SLN file reader/writer $(CliVersionPrefix) - netstandard1.6 + netstandard2.0 portable Microsoft.DotNet.Cli.Sln.Internal ../../tools/Key.snk @@ -23,7 +23,7 @@ - + diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index bcf9bd712..a998d6c36 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -3,8 +3,8 @@ $(SdkVersion) - netstandard1.5;net46 - netstandard1.5 + netstandard2.0;net46 + netstandard2.0 true ../../tools/Key.snk true @@ -28,11 +28,12 @@ - + + - + diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 0b4daa29e..3a96ee0b0 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -3,7 +3,7 @@ $(CliVersionPrefix) - netstandard1.5 + netstandard2.0 true ../../tools/Key.snk true diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj index a5c6d9d6a..a00fdccf2 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj +++ b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs index 74abc2a61..5ea10eaad 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs @@ -4,8 +4,8 @@ // NOTE: Currently, only the NET46 build ships (with Visual Studio/desktop msbuild), // but the netstandard1.5 adaptation here acts a proof-of-concept for cross-platform // portability of the underlying hostfxr API and gives us build and test coverage -// on non-Windows machines. -#if NETSTANDARD1_5 +// on non-Windows machines. It also ships with msbuild on Mono. +#if NETSTANDARD2_0 using System; using System.Runtime.InteropServices; @@ -50,4 +50,4 @@ namespace Microsoft.DotNet.MSBuildSdkResolver } } -#endif // NETSTANDARD1_5 \ No newline at end of file +#endif // NETSTANDARD2_0 diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs index 08a552479..a115a867b 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs @@ -176,7 +176,7 @@ namespace Microsoft.DotNet.MSBuildSdkResolver var environmentProvider = new EnvironmentProvider(_getEnvironmentVariable); var dotnetExe = environmentProvider.GetCommandPath("dotnet"); -#if NETSTANDARD1_5 +#if NETSTANDARD2_0 if (dotnetExe != null && !Interop.RunningOnWindows) { // e.g. on Linux the 'dotnet' command from PATH is a symlink so we need to diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index f804fa356..f7f7ced6b 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -3,8 +3,8 @@ $(SdkVersion) - netstandard1.5;net46 - netstandard1.5 + netstandard2.0;net46 + netstandard2.0 AnyCPU win-x86;win-x64 true @@ -20,11 +20,16 @@ - - + + - + + + + + + x86/hostfxr.dll diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index 4e9b4a96f..d672d5a52 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -4,10 +4,11 @@ Microsoft.DotNet.TestFramework Class Library $(CliVersionPrefix) - netstandard1.5 + netstandard2.0 ../../tools/Key.snk true true + 2.0.0 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 928a17ccb..54d458a52 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -50,7 +50,7 @@ - + diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj index e576ed679..ad3219ebe 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index b009123c0..f421d831f 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -29,7 +29,7 @@ - + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 2ac3bfe37..b8a0ed9a2 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -3,13 +3,13 @@ Microsoft.DotNet.Tools.Tests.Utilities Class Library - netstandard1.5 + netstandard2.0 Microsoft.DotNet.Tools.Tests.Utilities ../../tools/Key.snk true true $(AssetTargetFallback);dotnet5.4;portable-net451+win8 - 1.6.0 + 2.0.0 From 39f08229a34835d4fc37683c6976fe198f70170e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 22 Mar 2018 19:53:52 -0700 Subject: [PATCH 04/60] Updating InteropServices.Runtime to 4.3.0 in CLI utils and adding an explicit reference to netstandard 2.0 to TestFramework. --- .../Microsoft.DotNet.Cli.Utils.csproj | 4 ++-- .../Microsoft.DotNet.TestFramework.csproj | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index a998d6c36..68fdb256d 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -24,9 +24,9 @@ - + - + diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index d672d5a52..c312f7163 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -8,11 +8,14 @@ ../../tools/Key.snk true true - 2.0.0 + + + + \ No newline at end of file From fdac4bcbb964195f18e29aa3bb3672ac8976214a Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 23 Mar 2018 12:16:12 -0700 Subject: [PATCH 05/60] Update Roslyn to 2.8.0-beta3-62722-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 58b55035b..9219379e0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180213-0 - 2.8.0-beta2-62713-11 + 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.200-preview-62717-01 From 0d22280e0833c0d29452a9512798ed988e2161f0 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 23 Mar 2018 12:25:16 -0700 Subject: [PATCH 06/60] Update msbuild to 15.7.0-preview-000122 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 20f0187ca..5bc3bbdf3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000108 + 15.7.0-preview-000122 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From e49fab71439b02dc2d937887e37697554558effe Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 23 Mar 2018 14:17:25 -0700 Subject: [PATCH 07/60] Insert NuGet Build 4.7.0-preview3.5039 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 58b55035b..91a591c15 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview1.4982 + 4.7.0-preview3.5039 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 5e6765093af225294d1ea5a076ee33b2b63aa0ae Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Sat, 24 Mar 2018 21:19:34 -0700 Subject: [PATCH 08/60] MSBuild 15.7.124-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5bc3bbdf3..f8a0fa728 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000122 + 15.7.0-preview-000124 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 29ac66f7d2647b820dfc36bbbc30b6951220c39e Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Sat, 24 Mar 2018 11:59:36 -0500 Subject: [PATCH 09/60] Keep stdout for test execution Work around https://github.com/Microsoft/vstest/issues/1503 by using the MSBuild escape hatch variable MSBUILDENSURESTDOUTFORTASKPROCESSES and ensuring that tests don't run in a disconnected MSBuild process by passing /nr:false. --- src/dotnet/commands/dotnet-test/Program.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-test/Program.cs b/src/dotnet/commands/dotnet-test/Program.cs index d714d2f9e..8e837ae4c 100644 --- a/src/dotnet/commands/dotnet-test/Program.cs +++ b/src/dotnet/commands/dotnet-test/Program.cs @@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Tools.Test { "/t:VSTest", "/v:quiet", + "/nodereuse:false", // workaround for https://github.com/Microsoft/vstest/issues/1503 "/nologo" }; @@ -95,7 +96,23 @@ namespace Microsoft.DotNet.Tools.Test return e.ExitCode; } - return cmd.Execute(); + // Workaround for https://github.com/Microsoft/vstest/issues/1503 + const string NodeWindowEnvironmentName = "MSBUILDENSURESTDOUTFORTASKPROCESSES"; + string previousNodeWindowSetting = Environment.GetEnvironmentVariable(NodeWindowEnvironmentName); + + int result = -1; + + try + { + Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, "1"); + result = cmd.Execute(); + } + finally + { + Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, previousNodeWindowSetting); + } + + return result; } private static string GetSemiColonEscapedString(string arg) From 00c7557960afffc3611bd7e81f1e91111ab2c186 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 23 Mar 2018 14:17:25 -0700 Subject: [PATCH 10/60] Insert NuGet Build 4.7.0-preview3.5039 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f8a0fa728..da6b79f28 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview1.4982 + 4.7.0-preview3.5039 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3e0cee922dd52b1c5c23fe27d2e010e3ebbb719c Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 26 Mar 2018 09:34:40 -0700 Subject: [PATCH 11/60] Update SDK to 2.1.200-preview-62726-02 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dd1a7f499..45b3a1142 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62717-01 + 2.1.200-preview-62726-02 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From b783795dc94f4807f21286720dcd589d410fe8d2 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Mon, 26 Mar 2018 14:37:55 -0700 Subject: [PATCH 12/60] Update test SDK for 2.0 templates in the 15.7 SDK --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 45b3a1142..a56c0da1b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -19,7 +19,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.1-beta3-20180227-1423805 + 1.0.1-beta3-20180326-1520591 1.0.0-beta3-20171117-314 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 6600612b9e3734c0143c8eb05761707728d26d93 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 27 Mar 2018 10:24:10 -0700 Subject: [PATCH 13/60] Adding new docker files for opensuse.42.3, ubuntu.18.04 and fedora.27 and removing the project.json CLI from the build. It was not being used anymore. --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 1 + run-build.sh | 8 - scripts/docker/fedora.27/Dockerfile | 32 +++ scripts/docker/opensuse.42.3/Dockerfile | 49 +++++ scripts/docker/ubuntu.18.04/Dockerfile | 29 +++ .../TestAssets.cs | 34 +--- .../GivenAProjectToolsCommandResolver.cs | 2 +- .../Commands/BuildPJCommand.cs | 183 ------------------ .../Commands/RestoreProjectJsonCommand.cs | 28 --- .../ProjectUtils.cs | 27 --- .../RepoDirectoriesProvider.cs | 6 +- .../TestBase.cs | 3 +- 13 files changed, 116 insertions(+), 288 deletions(-) create mode 100644 scripts/docker/fedora.27/Dockerfile create mode 100644 scripts/docker/opensuse.42.3/Dockerfile create mode 100644 scripts/docker/ubuntu.18.04/Dockerfile delete mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs delete mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs delete mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c401e883..2217fae22 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.6 + 2.0.7-servicing-26322-01 $(MicrosoftNETCoreAppPackageVersion) 15.6.82 $(MicrosoftBuildPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 1155c016a..e0737ca5a 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -19,6 +19,7 @@ + diff --git a/run-build.sh b/run-build.sh index 597268b25..9d50c827f 100755 --- a/run-build.sh +++ b/run-build.sh @@ -163,14 +163,6 @@ if [ $EXIT_CODE != 0 ]; then exit $EXIT_CODE fi -# Install a project.json based CLI for use by tests -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "master" --install-dir "$DOTNET_INSTALL_DIR_PJ" --architecture "$ARCHITECTURE" --version "1.0.0-preview2-1-003177") -EXIT_CODE=$? -if [ $EXIT_CODE != 0 ]; then - echo "run-build: Error: installing project-json based cli failed with exit code $EXIT_CODE." >&2 - exit $EXIT_CODE -fi - # Put stage 0 on the PATH (for this shell only) PATH="$DOTNET_INSTALL_DIR:$PATH" diff --git a/scripts/docker/fedora.27/Dockerfile b/scripts/docker/fedora.27/Dockerfile new file mode 100644 index 000000000..e0f6e851d --- /dev/null +++ b/scripts/docker/fedora.27/Dockerfile @@ -0,0 +1,32 @@ +# +# 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. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM microsoft/dotnet-buildtools-prereqs:fedora-27-82a3800-20180326211504 + +RUN dnf install -y findutils + +RUN dnf upgrade -y nss + +RUN dnf clean all + +# Set a different rid to publish buildtools for, until we update to a version which +# natively supports fedora.24-x64 +ENV __PUBLISH_RID=fedora.23-x64 + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g wheel +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code \ No newline at end of file diff --git a/scripts/docker/opensuse.42.3/Dockerfile b/scripts/docker/opensuse.42.3/Dockerfile new file mode 100644 index 000000000..b128f8bc9 --- /dev/null +++ b/scripts/docker/opensuse.42.3/Dockerfile @@ -0,0 +1,49 @@ +# +# 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. +# + +FROM microsoft/dotnet-buildtools-prereqs:opensuse-42.3-d46ee12-20180327014902 + +# Install the base toolchain we need to build anything (clang, cmake, make and the like) +# this does not include libraries that we need to compile different projects, we'd like +# them in a different layer. +RUN zypper -n install binutils \ + cmake \ + which \ + gcc \ + llvm-clang \ + tar \ + ncurses-utils \ + curl \ + git \ + sudo && \ + zypper clean -a + +# Dependencies of CoreCLR and CoreFX. + +RUN zypper -n install --force-resolution \ + libunwind \ + libicu \ + lttng-ust \ + libuuid1 \ + libopenssl1_0_0 \ + libcurl4 \ + krb5 && \ + zypper clean -a + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g wheel +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code \ No newline at end of file diff --git a/scripts/docker/ubuntu.18.04/Dockerfile b/scripts/docker/ubuntu.18.04/Dockerfile new file mode 100644 index 000000000..97d0578c7 --- /dev/null +++ b/scripts/docker/ubuntu.18.04/Dockerfile @@ -0,0 +1,29 @@ +# +# 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. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721 + +RUN apt-get update && \ + apt-get -qqy install \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g sudo +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code \ No newline at end of file diff --git a/src/Microsoft.DotNet.TestFramework/TestAssets.cs b/src/Microsoft.DotNet.TestFramework/TestAssets.cs index 0e47e3ba9..ca4162fe0 100644 --- a/src/Microsoft.DotNet.TestFramework/TestAssets.cs +++ b/src/Microsoft.DotNet.TestFramework/TestAssets.cs @@ -17,13 +17,9 @@ namespace Microsoft.DotNet.TestFramework private FileInfo _dotnetCsprojExe; - private FileInfo _dotnetProjectJsonExe; - - private const string ProjectJsonSearchPattern = "project.json"; - private const string CsprojSearchPattern = "*.csproj"; - public TestAssets(DirectoryInfo assetsRoot, FileInfo dotnetCsprojExe, FileInfo dotnetProjectJsonExe) + public TestAssets(DirectoryInfo assetsRoot, FileInfo dotnetCsprojExe) { if (assetsRoot == null) { @@ -35,11 +31,6 @@ namespace Microsoft.DotNet.TestFramework throw new ArgumentNullException(nameof(dotnetCsprojExe)); } - if (dotnetProjectJsonExe == null) - { - throw new ArgumentNullException(nameof(dotnetProjectJsonExe)); - } - if (!assetsRoot.Exists) { throw new DirectoryNotFoundException($"Directory not found at '{assetsRoot}'"); @@ -50,16 +41,9 @@ namespace Microsoft.DotNet.TestFramework throw new FileNotFoundException("Csproj dotnet executable must exist", dotnetCsprojExe.FullName); } - if (!dotnetProjectJsonExe.Exists) - { - throw new FileNotFoundException("project.json dotnet executable must exist", dotnetProjectJsonExe.FullName); - } - _root = assetsRoot; _dotnetCsprojExe = dotnetCsprojExe; - - _dotnetProjectJsonExe = dotnetProjectJsonExe; } public TestAssetInfo Get(string name) @@ -78,22 +62,6 @@ namespace Microsoft.DotNet.TestFramework CsprojSearchPattern); } - public TestAssetInfo GetProjectJson(string name) - { - return GetProjectJson(TestAssetKinds.TestProjects, name); - } - - public TestAssetInfo GetProjectJson(string kind, string name) - { - var assetDirectory = new DirectoryInfo(Path.Combine(_root.FullName, kind, name)); - - return new TestAssetInfo( - assetDirectory, - name, - _dotnetProjectJsonExe, - ProjectJsonSearchPattern); - } - public DirectoryInfo CreateTestDirectory(string testProjectName = "temp", [CallerMemberName] string callingMethod = "", string identifier = "") { var testDestination = GetTestDestinationDirectoryPath(testProjectName, callingMethod, identifier); diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 4333b887c..fc38daf17 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.6"); + result.Args.Should().Contain("--fx-version 2.0.7-servicing-26322-01"); } [Fact] diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs deleted file mode 100644 index 6b05edfe8..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs +++ /dev/null @@ -1,183 +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.IO; -using Microsoft.DotNet.Cli.Utils; -using NuGet.Frameworks; - -namespace Microsoft.DotNet.Tools.Test.Utilities -{ - public sealed class BuildPJCommand : TestCommand - { - - private bool _captureOutput; - - private string _configuration; - - private NuGetFramework _framework; - - private string _runtime; - - private bool _noDependencies; - - private DirectoryInfo _outputPath; - - private FileInfo _projectFile; - - private DirectoryInfo _workingDirectory; - - public BuildPJCommand() - : base(new RepoDirectoriesProvider().PjDotnet) - { - } - - public override CommandResult Execute(string args = "") - { - args = $"build {GetNoDependencies()} {GetProjectFile()} {GetOutputPath()} {GetConfiguration()} {GetFramework()} {GetRuntime()} {args}"; - - if (_workingDirectory != null) - { - this.WithWorkingDirectory(_workingDirectory.FullName); - } - - if (_captureOutput) - { - return base.ExecuteWithCapturedOutput(args); - } - else - { - return base.Execute(args); - } - } - - public override CommandResult ExecuteWithCapturedOutput(string args = "") - { - WithCapturedOutput(); - - return Execute(args); - } - - public BuildPJCommand WithCapturedOutput() - { - _captureOutput = true; - - return this; - } - - public BuildPJCommand WithConfiguration(string configuration) - { - _configuration = configuration; - - return this; - } - - public BuildPJCommand WithFramework(NuGetFramework framework) - { - _framework = framework; - - return this; - } - - public BuildPJCommand WithRuntime(string runtime) - { - _runtime = runtime; - - return this; - } - - public BuildPJCommand WithNoDependencies() - { - _noDependencies = true; - - return this; - } - - public BuildPJCommand WithOutputPath(DirectoryInfo outputPath) - { - _outputPath = outputPath; - - return this; - } - - public BuildPJCommand WithProjectDirectory(DirectoryInfo projectDirectory) - { - _workingDirectory = projectDirectory; - - return this; - } - - public BuildPJCommand WithProjectFile(FileInfo projectFile) - { - _projectFile = projectFile; - - return this; - } - - public BuildPJCommand WithWorkingDirectory(DirectoryInfo workingDirectory) - { - _workingDirectory = workingDirectory; - - return this; - } - - private string GetConfiguration() - { - if (_configuration == null) - { - return null; - } - - return $"--configuration {_configuration}"; - } - - private string GetFramework() - { - if (_framework == null) - { - return null; - } - - return $"--framework {_framework.GetShortFolderName()}"; - } - - private string GetRuntime() - { - if (_runtime == null) - { - return null; - } - - return $"--runtime {_runtime}"; - } - - private string GetNoDependencies() - { - if (!_noDependencies) - { - return null; - } - - return "--no-dependencies"; - } - - private string GetOutputPath() - { - if (_outputPath == null) - { - return null; - } - - return $"\"{_outputPath.FullName}\""; - } - - private string GetProjectFile() - { - if (_projectFile == null) - { - return null; - } - - return $"\"{_projectFile.FullName}\""; - } - } -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs deleted file mode 100644 index a54d89605..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs +++ /dev/null @@ -1,28 +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 Microsoft.DotNet.Cli.Utils; - -namespace Microsoft.DotNet.Tools.Test.Utilities -{ - public sealed class RestoreProjectJsonCommand : TestCommand - { - public RestoreProjectJsonCommand() - : base(new RepoDirectoriesProvider().PjDotnet) - { - } - - public override CommandResult Execute(string args="") - { - args = $"restore {args}"; - - return base.Execute(args); - } - - public override CommandResult ExecuteWithCapturedOutput(string args = "") - { - args = $"restore {args}"; - return base.ExecuteWithCapturedOutput(args); - } - } -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs deleted file mode 100644 index 3b812ed28..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs +++ /dev/null @@ -1,27 +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; -using System.IO; -using System.Linq; - -namespace Microsoft.DotNet.Tools.Test.Utilities -{ - public class ProjectUtils - { - public static string GetProjectJson(string testRoot, string project) - { - // We assume that the project name same as the directory name with contains the project.json - // We can do better here by using ProjectReader to get the correct project name - string projectPath = Directory.GetFiles(testRoot, "project.json", SearchOption.AllDirectories) - .FirstOrDefault(pj => Directory.GetParent(pj).Name.Equals(project)); - - if (string.IsNullOrEmpty(projectPath)) - { - throw new Exception($"Cannot file project '{project}' in '{testRoot}'"); - } - - return projectPath; - } - } -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index 2f5e1e830..e86f76bac 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -20,7 +20,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string _stage2Sdk; private string _stage2WithBackwardsCompatibleRuntimesDirectory; private string _testPackages; - private string _pjDotnet; public static string RepoRoot { @@ -81,7 +80,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities public string Artifacts => _artifacts; public string BuiltDotnet => _builtDotnet; public string NugetPackages => _nugetPackages; - public string PjDotnet => _pjDotnet; public string Stage2Sdk => _stage2Sdk; public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory; public string TestPackages => _testPackages; @@ -91,13 +89,11 @@ namespace Microsoft.DotNet.Tools.Test.Utilities string builtDotnet = null, string nugetPackages = null, string corehostPackages = null, - string corehostDummyPackages = null, - string pjDotnet = null) + string corehostDummyPackages = null) { _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", BuildRid); _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish"); _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages"); - _pjDotnet = pjDotnet ?? GetPjDotnetPath(); _stage2Sdk = Directory .EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")) .First(d => !d.Contains("NuGetFallbackFolder")); diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs index b377b4331..974686b92 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs @@ -52,8 +52,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities s_testAssets = new TestAssets( new DirectoryInfo(assetsRoot), - new FileInfo(new Muxer().MuxerPath), - new FileInfo(new RepoDirectoriesProvider().PjDotnet)); + new FileInfo(new Muxer().MuxerPath)); } return s_testAssets; From 094a7b2375454f70c4f1247d973720ac5c705c16 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 27 Mar 2018 16:14:03 -0700 Subject: [PATCH 14/60] Adding Fedora 27, OpenSuse 43.2 and Ubuntu 18.04 to the groovy file to enable these legs in CI. --- netci.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/netci.groovy b/netci.groovy index ca09235d7..f2cf6a834 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', 'OSX10.12: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', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'ubuntu.18.04:x64:Debug', 'fedora.27:x64:Debug', 'opensuse.43.2:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -20,6 +20,7 @@ platformList.each { platform -> // Calculate names def (os, architecture, configuration) = platform.tokenize(':') def osUsedForMachineAffinity = os; + def osVersionUsedForMachineAffinity = 'latest-or-auto'; // Calculate job name def jobName = getBuildJobName(configuration, os, architecture) @@ -39,6 +40,11 @@ platformList.each { platform -> osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --targets Default" } + else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.43.2') { + osUsedForMachineAffinity = 'Ubuntu16.04' + osVersionUsedForMachineAffinity = 'latest-docker' + buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --docker ${os} --targets Default" + } else { // Jenkins non-Ubuntu CI machines don't have docker buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" @@ -58,7 +64,7 @@ platformList.each { platform -> } } - Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto') + Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") Utilities.addMSTestResults(newJob, '**/*.trx') Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") From 56a01638e16d19336068254826057d6d42f85b76 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 27 Mar 2018 18:29:31 -0500 Subject: [PATCH 15/60] MSBuild 15.7.127.34537 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a56c0da1b..a216fe303 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000124 + 15.7.0-preview-000127 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From b250271ac18ec265e2d3030ef9bf1d8d0c64b3eb Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 27 Mar 2018 16:38:29 -0700 Subject: [PATCH 16/60] Removing the dependency on the project.json CLI from the windows build scripts as well. --- run-build.ps1 | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index 366267f3e..150a6ba72 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -53,20 +53,6 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR)) mkdir $env:DOTNET_INSTALL_DIR | Out-Null } -# We also need to pull down a project.json based CLI that is used by some tests -# so create another directory for that. -if (!$env:DOTNET_INSTALL_DIR_PJ) -{ - $env:DOTNET_INSTALL_DIR_PJ="$RepoRoot\.dotnet_stage0PJ\$Architecture" -} - -if (!(Test-Path $env:DOTNET_INSTALL_DIR_PJ)) -{ - mkdir $env:DOTNET_INSTALL_DIR_PJ | Out-Null -} - - - # Disable first run since we want to control all package sources $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -88,14 +74,6 @@ if ($LastExitCode -ne 0) exit $LastExitCode } -Write-Output "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" -Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" -if ($LastExitCode -ne 0) -{ - Write-Output "The .NET CLI installation failed with exit code $LastExitCode" - exit $LastExitCode -} - # Put the stage0 on the path $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH" From 32ac8d897b2ce3cc30ebf13d3b96b85a3f9e295f Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 28 Mar 2018 22:39:07 -0700 Subject: [PATCH 17/60] Insert NuGet Build 4.7.0-preview3.5052 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a216fe303..5e6ef73a1 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview3.5039 + 4.7.0-preview3.5052 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c271df6f6a3bd791fd2af17a2c85e2b0a9632148 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 28 Mar 2018 22:41:18 -0700 Subject: [PATCH 18/60] Insert NuGet Build 4.6.2-rtm-5055 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c401e883..9a093e602 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.1-rtm-5019 + 4.6.2-rtm-5055 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c4f42d3e6cf4060bd64df9258b965bd3c5a1014b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 11:52:16 -0700 Subject: [PATCH 19/60] Adding a step to shutdown the vbcscompiler after test execution. --- build/Test.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/Test.targets b/build/Test.targets index 83591e179..36faa3cf2 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -74,6 +74,8 @@ Projects="@(ProjectsToTest)"> + + From 1e42b63860c6d1580e920581a9688d0e81e170c8 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 21:33:27 -0700 Subject: [PATCH 20/60] Updating the branding of the CLI to 2.1.104. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index afdf7976b..4b0a55ab0 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.103 + Microsoft .NET Core SDK - 2.1.104 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index b7a218a68..8753235f1 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 103 + 104 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index d21ee9fc4..59d03795e 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.103 + • .NET Core SDK 2.1.104 • .NET Core Runtime 2.0.6 • Runtime Package Store From 820ea7c54f311e19c8298e2234cc82a1759a362b Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 29 Mar 2018 21:59:27 -0700 Subject: [PATCH 21/60] Updating SDK to 2.1.200-preview-62730-02 This brings back an SDK with a matching version of NuGet. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5e6ef73a1..cf8c6f7e9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62726-02 + 2.1.200-preview-62730-02 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 9ba1de58dee79bfb5620fc6caaa94e0c9680c3e5 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 22:29:46 -0700 Subject: [PATCH 22/60] Revert the runtime to 2.0.6 because we need to service the SDK with a new NuGet. --- build/DependencyVersions.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index be87b86d7..9a093e602 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.7-servicing-26322-01 + 2.0.6 $(MicrosoftNETCoreAppPackageVersion) 15.6.82 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index fc38daf17..4333b887c 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.7-servicing-26322-01"); + result.Args.Should().Contain("--fx-version 2.0.6"); } [Fact] From b84a0eb8b234619e11b72a3351be1f3fb246c22f Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 29 Mar 2018 23:11:58 -0700 Subject: [PATCH 23/60] MSBuild 15.6.84 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index be87b86d7..62e529dca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.7-servicing-26322-01 $(MicrosoftNETCoreAppPackageVersion) - 15.6.82 + 15.6.84 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From d3a78f7d3fd9e1b55f17f336bf8668025c65abb7 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Fri, 30 Mar 2018 09:10:10 -0700 Subject: [PATCH 24/60] Add msbuild myget.org feed --- build/NugetConfigFile.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index e0737ca5a..55ebdf871 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -33,6 +33,7 @@ + ]]> From 27435ea589fd6b516400ad41bb4affe508f54c1a Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 30 Mar 2018 10:21:43 -0700 Subject: [PATCH 25/60] Update SDK to 2.1.100-preview-62730-07 Contains a matching NuGet version to the one in the CLI. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9a093e602..5d19eb80f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.7.0-beta3-62707-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.100-preview-62721-01 + 2.1.100-preview-62730-07 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From 5b8949e66b2512412f9dbc7b79fc54fa6409f70a Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 18:19:24 -0700 Subject: [PATCH 26/60] Updating the runtime to 2.0.7 and the CLI branding to 2.1.104. --- build/Branding.props | 2 +- build/DependencyVersions.props | 3 ++- .../GivenAProjectToolsCommandResolver.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 4b0a55ab0..234b69304 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.104 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.6 + Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 25a97c5bb..8e732a775 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,8 @@ - 2.0.6 + + 2.0.7 $(MicrosoftNETCoreAppPackageVersion) 15.6.84 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 4333b887c..90f68472c 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.6"); + result.Args.Should().Contain("--fx-version 2.0.7"); } [Fact] From caff97a3ee6e4e4c25ffa282e0a2c4d163876b7b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 21:37:27 -0700 Subject: [PATCH 27/60] Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 4 ++-- packaging/windows/clisdk/bundle.wxl | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 234b69304..3a8979d5d 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.104 + Microsoft .NET Core SDK - 2.1.105 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 8753235f1..72f42115f 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 104 + 105 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 59d03795e..53b6fca6e 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,8 +50,8 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.104 - • .NET Core Runtime 2.0.6 + • .NET Core SDK 2.1.105 + • .NET Core Runtime 2.0.7 • Runtime Package Store This product collects usage data From 9b68d55059fc043c66496ea5c3405d59d5e94d6c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 30 Mar 2018 13:24:07 -0700 Subject: [PATCH 28/60] Moving the opensuse 43.2 docker file to the right folder. --- scripts/docker/{opensuse.42.3 => opensuse.43.2}/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/docker/{opensuse.42.3 => opensuse.43.2}/Dockerfile (100%) diff --git a/scripts/docker/opensuse.42.3/Dockerfile b/scripts/docker/opensuse.43.2/Dockerfile similarity index 100% rename from scripts/docker/opensuse.42.3/Dockerfile rename to scripts/docker/opensuse.43.2/Dockerfile From c5f3e09520f174b90dbe2bc41996abe53854e74c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 30 Mar 2018 09:09:43 -0700 Subject: [PATCH 29/60] Update to ASP.NET Core 2.0.7 build 228 - Remove unused myget feeds - Refactor how we keep track of all previous versions of the runtime store --- build/BundledRuntimes.props | 5 +-- build/DependencyVersions.props | 18 ++++++++--- build/NugetConfigFile.targets | 10 +++--- build/package/Installer.DEB.proj | 21 +++---------- build/package/Installer.DEB.targets | 39 ++++++----------------- build/package/Installer.RPM.targets | 48 ++++++++--------------------- 6 files changed, 48 insertions(+), 93 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 82f47ecca..4d36aadd9 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -5,7 +5,7 @@ -internal - + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) @@ -34,9 +34,10 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) + $(DotnetBlobRootUrl)/aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) - + $(HostOSName)$(Architecture) $(HostOSName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c210b83f7..b89c4681c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -58,22 +58,32 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.6 + 2.0.7 notimestamp + + 2.0.0;2.0.3;2.0.5;2.0.6 + - 2.0.6 + 2.0.7 rtm - 2.0.6 - 10011 + 2.0.7 + 228 + $(AspNetCoreVerison) + $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) + + + + + 2.1.0-prerelease-02430-04 diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 55ebdf871..38e858fff 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -4,7 +4,7 @@ - + - + @@ -30,8 +30,6 @@ - - ]]> @@ -43,13 +41,13 @@ ]]> - + - + - - - - + - - - - + @@ -106,6 +100,7 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); + @(AspNetCoreDebInstallerFile); $(SdkInstallerFile);" Outputs="$(DebianTestResultsXmlFile)" > @@ -113,10 +108,7 @@ - - - - + @@ -130,10 +122,7 @@ - - - - + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index f4cfc11a2..57b5a603d 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,14 +35,6 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreRuntimePackageBrandName)-2.0.0 - $(AspNetCoreRuntimePackageBrandName)-2.0.3 - $(AspNetCoreRuntimePackageBrandName)-2.0.5 - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) - $(HostRid) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -125,26 +117,15 @@ - - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) - - - - - + + + + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).deb$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity) + + + + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 04d79e051..ce69dad4f 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,16 +50,10 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host - $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 - $(AspNetCoreRuntimePackageBrandName)-2.0.5 - $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreVersion) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -187,27 +181,15 @@ - - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) - - - - - + + + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).rpm$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity) + + + + @@ -235,7 +217,7 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); - $(DownloadedSharedAspNetCoreRuntime); + @(AspNetCoreRpmInstallerFile); $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > @@ -243,10 +225,7 @@ - - - - + @@ -261,10 +240,7 @@ - - - - + From c20f79e8e39ebc5c188134e3878eac933f9d04ef Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 30 Mar 2018 16:20:38 -0700 Subject: [PATCH 30/60] Reverse the order in which old runtime stores are listed --- build/DependencyVersions.props | 12 ++++++++---- build/package/Installer.DEB.proj | 12 ++++++++++-- build/package/Installer.RPM.targets | 6 +++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b89c4681c..0b86826ab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -63,9 +63,6 @@ AspNetCoreRelease is only used if the value of this property is "timestamped" --> notimestamp - - 2.0.0;2.0.3;2.0.5;2.0.6 - 2.0.7 rtm @@ -80,8 +77,15 @@ - + + + + + diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 2c0447372..71408e33b 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -21,11 +21,15 @@ Inputs="@(CLISdkFiles)" Outputs="$(SdkInstallerFile)" > + + + + - + + + + + - + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index ce69dad4f..2053557fc 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -221,11 +221,15 @@ $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > + + + + - + From 370243ab81c43fe0e3e2a57c1d101b45724ea75e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 30 Mar 2018 17:57:03 -0700 Subject: [PATCH 31/60] Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0. --- .../GivenDotnetPublishPublishesProjects.cs | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2db2018fa..ad9991805 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -4,7 +4,9 @@ using System; using System.IO; using System.Diagnostics; +using System.Linq; using System.Runtime.InteropServices; +using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.PlatformAbstractions; @@ -103,7 +105,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance() .WithSourceFiles() - .WithRestoreFiles(); + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + + // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. + // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the + // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we + // need a manual roll-forward. + propertyGroup.Add( + new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); + }); var testProjectDirectory = testInstance.Root; @@ -170,7 +184,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance($"PublishesSelfContained{selfContained}") .WithSourceFiles() - .WithRestoreFiles(); + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + + // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. + // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the + // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we + // need a manual roll-forward. + propertyGroup.Add( + new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); + }); var testProjectDirectory = testInstance.Root; From 15c631b02201912ca4209339e9762b0ac29e4445 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Mon, 2 Apr 2018 10:36:26 -0700 Subject: [PATCH 32/60] Insert NuGet Build 4.7.0-preview3.5059 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cf8c6f7e9..e41fe8d29 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview3.5052 + 4.7.0-preview3.5059 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From beea8c2e9ba81ff3ca1b255be9c54b5e26293581 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 2 Apr 2018 10:55:15 -0700 Subject: [PATCH 33/60] Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl CoreSetupBlobRootUrl determines from which blob storage the CLI consumes bits. That's the right URL to use for consuming asp.net bits as well. --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 4d36aadd9..eb8c4cc57 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -34,7 +34,7 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) - $(DotnetBlobRootUrl)/aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json + $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) From 3f05bb71ab052766132895b58a20fd7b25658bb6 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 2 Apr 2018 21:51:23 -0700 Subject: [PATCH 34/60] Updating SDK to 2.1.200-preview-62803-04 This contains a matching NuGet version to the one in the CLI. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e41fe8d29..65d41dbe6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62730-02 + 2.1.200-preview-62803-04 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From de09fb5104bfe5a89b7adbf584184ccaaa05e8cc Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 3 Apr 2018 16:20:11 -0700 Subject: [PATCH 35/60] Producing an empty commit to trigger a rebuild of the CLI The runtime had to spin in place and as such we need a "fake" commit to trigger a CLI rebuild using the new runtime bits. From 21529f350d520492a1b5a4feaa91fb2e147b585f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 3 Apr 2018 17:21:31 -0700 Subject: [PATCH 36/60] Update to aspnet 2.0.7 build 230 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3761882a7..b287f41d5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.7 rtm 2.0.7 - 228 + 230 $(AspNetCoreVerison) $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From 674f64c4c7cf66ac72716c230d17d21eb0a46ebf Mon Sep 17 00:00:00 2001 From: Mayank Bansal Date: Wed, 4 Apr 2018 14:08:12 +0530 Subject: [PATCH 37/60] Insert Testplatform 15.7 RTM package in dotnet SDK --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 65d41dbe6..e74411c27 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -40,7 +40,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.7.0-preview-20180320-02 + 15.7.0 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From 9fb0f9a35b476f71d63b594a0b15e110123b41a9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 13:14:13 -0700 Subject: [PATCH 38/60] Fix a typo in the rpm.targets when testing the rpm generated packages. --- build/package/Installer.RPM.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 2053557fc..cb06d9823 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -188,8 +188,8 @@ - + From 364ee996bf3dd6c69f4ac89b3ff504481530e1bf Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 22:43:37 -0700 Subject: [PATCH 39/60] Fixing another typo in that is breaking RHEL. --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b287f41d5..cb1243b3a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -69,8 +69,8 @@ rtm 2.0.7 230 - $(AspNetCoreVerison) - $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) + $(AspNetCoreVersion) + $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From d0aca6fb7b47f1f2ba2b503e5061fcee9424bf23 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 5 Apr 2018 09:43:20 -0700 Subject: [PATCH 40/60] Updating SDK to 2.1.200-preview-62805-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 65d41dbe6..f1459deab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62803-04 + 2.1.200-preview-62805-05 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 8fa1c8230b3f2638d195dc9bcd61bd066dc5eb2d Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 6 Apr 2018 10:52:34 -0700 Subject: [PATCH 41/60] Align dotnetcli with VS2017.4 compiler --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 36a179113..3e4913f85 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.4-rtm-180213-0 + 10.1.4-rtm-180403-0 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 8370f24850f5ac02305d3b5a712606d751ce984f Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Sun, 8 Apr 2018 11:57:30 -0700 Subject: [PATCH 42/60] Update test templates to use the 15.7.0 test SDK --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 36a179113..3e16b3b4c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -20,7 +20,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.1-beta3-20180326-1520591 + 1.0.2-beta3-20180408-1569068 1.0.0-beta3-20171117-314 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 1860d4332327f13f3222e358b5c9794cae70110c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 9 Apr 2018 12:14:47 -0700 Subject: [PATCH 43/60] Update to ASP.NET Core 2.0.7 build 231 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cb1243b3a..f485d871e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.7 rtm 2.0.7 - 230 + 231 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From d43718d44433669513566fd3c2c84ea228a9fbc1 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 10 Apr 2018 08:49:48 -0700 Subject: [PATCH 44/60] Insert NuGet Build 4.7.0-rtm.5081 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 36a179113..2e7655eab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview3.5059 + 4.7.0-rtm.5081 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 18dd8107f264632b35752ac0b78f0a9b94520c56 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 3 Apr 2018 12:58:51 -0700 Subject: [PATCH 45/60] Removing the explicit dependency on System.Diagnostics.Process from Cli.Utils. Use the assembly from netstandard. --- src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 68fdb256d..596020031 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -30,7 +30,6 @@ - From 51214d02b11cabfc01cc0c661867a13096ca34aa Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Tue, 10 Apr 2018 13:40:30 -0700 Subject: [PATCH 46/60] MSBuild 15.7.163 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2e7655eab..ed82a8801 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.7 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000127 + 15.7.0-preview-000163 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From fef4ae58af31bc354fdba5f8def6867765797d4e Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 11 Apr 2018 22:23:35 -0700 Subject: [PATCH 47/60] Update SDK to 2.1.200-preview-62812-03 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 38359655e..67f3b6922 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62805-05 + 2.1.200-preview-62812-03 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 0ed1ffb8dd934c9f1b269f09508ddf09a5cd6be4 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 13 Apr 2018 10:44:27 -0700 Subject: [PATCH 48/60] Insert NuGet Build 4.7.0-rtm.5096 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 67f3b6922..2f486b835 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5081 + 4.7.0-rtm.5096 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 6a3419cedd4ec1fcd1ba62443830059282232006 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 13 Apr 2018 14:03:00 -0700 Subject: [PATCH 49/60] Insert NuGet Build 4.7.0-rtm.5104 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2f486b835..3c9b87c14 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5096 + 4.7.0-rtm.5104 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 83d150e87b6d1b85a349b67aa5ecfb71ee0c6235 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 16 Apr 2018 10:38:21 -0700 Subject: [PATCH 50/60] Update SDK to 2.1.200-preview-62816-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c9b87c14..75cab6558 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62812-03 + 2.1.200-preview-62816-05 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 3c344c2f832f8775fde0510cb90ca4e93d514128 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 18 Apr 2018 12:03:42 -0700 Subject: [PATCH 51/60] Update Roslyn to 2.8.0-dev-62817-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 75cab6558..32d6a871e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180403-0 - 2.8.0-beta3-62722-05 + 2.8.0-dev-62817-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.200-preview-62816-05 From 2d008aa4f74dabb7ab8b9e85aaa17d93dc1fc78f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 18 Apr 2018 21:35:57 -0700 Subject: [PATCH 52/60] Add tests that assert the dependencies of the dotnet-sdk rpm and deb files --- build/package/Installer.DEB.targets | 1 + build/package/Installer.RPM.targets | 3 +- test/EndToEnd/GivenDotNetLinuxInstallers.cs | 83 +++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 test/EndToEnd/GivenDotNetLinuxInstallers.cs diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 57b5a603d..3724823f6 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -109,6 +109,7 @@ + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index cb06d9823..093d820b4 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -137,6 +137,7 @@ + @@ -238,7 +239,7 @@ ToolPath="$(RpmInstalledDirectory)" /> diff --git a/test/EndToEnd/GivenDotNetLinuxInstallers.cs b/test/EndToEnd/GivenDotNetLinuxInstallers.cs new file mode 100644 index 000000000..4968f0221 --- /dev/null +++ b/test/EndToEnd/GivenDotNetLinuxInstallers.cs @@ -0,0 +1,83 @@ +// 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; +using System.IO; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; + +namespace Microsoft.DotNet.Tests.EndToEnd +{ + public class GivenDotNetLinuxInstallers + { + [Fact] + public void ItHasExpectedDependencies() + { + var installerFile = Environment.GetEnvironmentVariable("SDK_INSTALLER_FILE"); + if (string.IsNullOrEmpty(installerFile)) + { + return; + } + + var ext = Path.GetExtension(installerFile); + switch (ext) + { + case ".deb": + DebianPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(installerFile); + return; + case ".rpm": + RpmPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(installerFile); + return; + } + } + + private void DebianPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(string installerFile) + { + // Example output: + + // $ dpkg --info dotnet-sdk-2.1.105-ubuntu-x64.deb + + // new debian package, version 2.0. + // size 75660448 bytes: control archive=29107 bytes. + // 717 bytes, 11 lines control + // 123707 bytes, 1004 lines md5sums + // 1710 bytes, 28 lines * postinst #!/usr/bin/env + // Package: dotnet-sdk-2.1.104 + // Version: 2.1.104-1 + // Architecture: amd64 + // Maintainer: Microsoft + // Installed-Size: 201119 + // Depends: dotnet-runtime-2.0.6, aspnetcore-store-2.0.6 + // Section: devel + // Priority: standard + // Homepage: https://dotnet.github.io/core + // Description: Microsoft .NET Core SDK - 2.1.104 + + new TestCommand("dpkg") + .ExecuteWithCapturedOutput($"--info {installerFile}") + .Should().Pass() + .And.HaveStdOutMatching(@"Depends:.*\s?dotnet-runtime-\d+(\.\d+){2}") + .And.HaveStdOutMatching(@"Depends:.*\s?aspnetcore-store-\d+(\.\d+){2}"); + } + + private void RpmPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(string installerFile) + { + // Example output: + + // $ rpm -qpR dotnet-sdk-2.1.105-rhel-x64.rpm + + // dotnet-runtime-2.0.7 >= 2.0.7 + // aspnetcore-store-2.0.7 >= 2.0.7 + // /bin/sh + // /bin/sh + // rpmlib(PayloadFilesHavePrefix) <= 4.0-1 + // rpmlib(CompressedFileNames) <= 3.0.4-1 + + new TestCommand("rpm") + .ExecuteWithCapturedOutput($"-qpR {installerFile}") + .Should().Pass() + .And.HaveStdOutMatching(@"dotnet-runtime-\d+(\.\d+){2} >= \d+(\.\d+){2}") + .And.HaveStdOutMatching(@"aspnetcore-store-\d+(\.\d+){2} >= \d+(\.\d+){2}"); + } + } +} From f729fad2930f988718815c91d6c3bea426091555 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 18 Apr 2018 21:41:06 -0700 Subject: [PATCH 53/60] Fix the aspnetcore dependency on .rpm and .deb installers --- build/DependencyVersions.props | 1 - build/package/Installer.DEB.targets | 3 ++- build/package/Installer.RPM.targets | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f485d871e..2356895c6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -73,7 +73,6 @@ $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store - $(AspNetCoreVersion)-$(AspNetCoreRelease) $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 3724823f6..3d3cc7bad 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,6 +35,7 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host + $(AspNetCoreRuntimePackageBrandName)-$(CurrentAspNetCoreRuntimeVersion) @@ -84,7 +85,7 @@ $(SharedFxDebianPackageName) - $(AspNetCoreRuntimePackageName) + $(AspNetCoreRuntimeDebPackageName) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 093d820b4..fd9d4b117 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,10 +50,8 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) - $(AspNetCoreRuntimePackageBrandName)-2.0.0 - $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-$(CurrentAspNetCoreRuntimeVersion) + $(CurrentAspNetCoreRuntimeVersion) $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -112,10 +110,10 @@ $(SharedFrameworkVersion) - $(AspNetCoreRuntimePackageName) + $(AspNetCoreRuntimeRpmPackageName) - $(AspNetCoreRuntimePackageVersion) + $(AspNetCoreRuntimeRpmPackageVersion) $(SharedFxRpmPackageName) From 205f58496fdbf6b92b3d231514032cfcfd3e44c2 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 20 Apr 2018 13:09:19 -0700 Subject: [PATCH 54/60] Insert NuGet Build 4.7.0-rtm.5122 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b01c20ee2..5164ea400 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5104 + 4.7.0-rtm.5122 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 6d9a4f1c6512839f75e0ad3bd46c89ac418f8ab6 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 20 Apr 2018 15:21:46 -0700 Subject: [PATCH 55/60] Update SDK to 2.1.200-preview-62820-08 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5164ea400..f6afcc36e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-dev-62817-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62816-05 + 2.1.200-preview-62820-08 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 458ad92d4963c3450368518cdfc922c3a53bc322 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 24 Apr 2018 14:50:13 -0700 Subject: [PATCH 56/60] Insert NuGet Build 4.7.0-rtm.5148 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 416f525a1..f04a3a95f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5122 + 4.7.0-rtm.5148 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From a711c264f11232703cde1b5cc52161efe0cf82f7 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 24 Apr 2018 16:00:33 -0700 Subject: [PATCH 57/60] Update Roslyn to 2.8.0-beta4-62824-10 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 416f525a1..3ead01f96 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180403-0 - 2.8.0-dev-62817-01 + 2.8.0-beta4-62824-10 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.200-preview-62820-08 From a4cc9fa5e0658fdd97c8f4057d7ba8904d43e295 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 25 Apr 2018 20:02:09 -0700 Subject: [PATCH 58/60] MSBuild 15.7.177 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3ead01f96..d9dd3a07c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.7 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000163 + 15.7.177 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From fc577e6b057371cda5bc36068d9022400ac49eea Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 26 Apr 2018 14:12:42 -0700 Subject: [PATCH 59/60] Update SDK to 2.1.200-preview-62826-08 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e6efd3f8e..ec7ce53f6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta4-62824-10 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62820-08 + 2.1.200-preview-62826-08 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 70994ee6dd1373956e797fbbf688c7db6d3b3bdd Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 27 Apr 2018 14:06:19 -0700 Subject: [PATCH 60/60] Update SDK to 2.1.200-preview-62827-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ec7ce53f6..cc74fb681 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta4-62824-10 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62826-08 + 2.1.200-preview-62827-05 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion)