From 382773a5ace4c8d73dbf549cd14b861cdd745550 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sun, 25 Nov 2018 08:38:38 -0800 Subject: [PATCH 01/15] Delete slack link, standardize on gitter Port https://github.com/dotnet/cli/pull/9556 to core-sdk --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efd840218..def645605 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # .NET Core SDK -[![.NET Slack Status](https://aspnetcoreslack.herokuapp.com/badge.svg?2)](http://tattoocoder.com/aspnet-slack-sign-up/) [![Join the chat at https://gitter.im/dotnet/cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotnet/cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/dotnet/cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotnet/cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) This repo contains the source code for the cross-platform [.NET Core](http://github.com/dotnet/core) SDK. It aggregates the .NET Toolchain, the .NET Core runtime, the templates, the offline packages cache, and the ASP.NET Runtime store. It produces zip, tarballs, and native packages for various supported platforms. From 14dff36d3d8d94db56a20c76df0f6a9d2ca34b96 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 26 Nov 2018 12:26:58 -0800 Subject: [PATCH 02/15] Fix .binlog archiving A second '/bl' parameter to msbuild looks to have been causing the filename specified in the first one to be ignored, which meant the log filename didn't match what was set up in the build definition --- eng/build.yml | 2 +- run-build.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index b3e658fbe..dbedf68ee 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -66,7 +66,7 @@ phases: SourceFolder: '$(Build.SourcesDirectory)' Contents: | msbuild.log - msbuild.mainbuild.binlog + msbuild.binlog msbuild.generatepropsfile.binlog TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true diff --git a/run-build.ps1 b/run-build.ps1 index e0db7acb9..1706ea263 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -113,6 +113,6 @@ if ($NoBuild) else { dotnet msbuild build.proj /bl:msbuild.generatepropsfile.binlog /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $ExtraParametersNoTargets - dotnet msbuild build.proj /bl:msbuild.mainbuild.binlog /m /v:normal /fl /flp:v=diag /bl /p:Architecture=$Architecture $ExtraParameters + dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /bl /p:Architecture=$Architecture $ExtraParameters if($LASTEXITCODE -ne 0) { throw "Failed to build" } } From 8345369e2a4b6fd77d4a245361b7cacf23d977f8 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 26 Nov 2018 17:12:41 -0800 Subject: [PATCH 03/15] Include asp.net in arm builds --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 8c1145d1b..5c1bed87d 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -100,7 +100,7 @@ <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile" - Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxArchiveRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )"> + Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxArchiveFile) $(AspNetCoreSharedFxPublishDirectory) From a8c664ba67722286e29aa57191cc9e472801d7d2 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 26 Nov 2018 18:58:37 -0800 Subject: [PATCH 04/15] Enable targeting .NET Core 2.2 --- build/MSBuildExtensions.targets | 13 +++++++++++++ .../GivenAspNetAppsResolveImplicitVersions.cs | 3 +-- test/EndToEnd/SupportedNetCoreAppVersions.cs | 3 +-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index b07fe4628..81d3b1c4e 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -71,6 +71,10 @@ TargetFrameworkVersion="2.1" DefaultVersion="2.1.0" LatestVersion="2.1.6" /> + + + + diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs index f8b781be6..fe419ab54 100644 --- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs +++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs @@ -216,8 +216,7 @@ namespace EndToEnd get { yield return new object[] { "2.1" }; - // 2.2 not yet stable - //yield return new object[] { "2.2" }; + yield return new object[] { "2.2" }; yield return new object[] { LatestSupportedAspNetCoreAppVersion }; } } diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 5010a4d42..6c9adff95 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -20,8 +20,7 @@ namespace EndToEnd "1.1", "2.0", "2.1", - // 2.2 currently disabled in master: https://github.com/dotnet/cli/issues/10125 - // "2.2", + "2.2", "3.0" }; } From e2419b091cc570c389b8da8084b93aa3e13a1ad0 Mon Sep 17 00:00:00 2001 From: Obeyda Djeffal Date: Tue, 27 Nov 2018 21:09:46 +0100 Subject: [PATCH 05/15] Fix broken package links in README (#173) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index efd840218..42bb30bdb 100644 --- a/README.md +++ b/README.md @@ -225,7 +225,7 @@ Reference notes: [linux-version-2.1.4XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/latest.version [linux-DEB-installer-2.1.4XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb [linux-DEB-installer-checksum-2.1.4XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer-2.1.4XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb.sha +[linux-RPM-installer-2.1.4XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.rpm [linux-RPM-installer-checksum-2.1.4XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.rpm.sha [linux-targz-2.1.4XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum-2.1.4XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-x64.tar.gz.sha @@ -234,7 +234,7 @@ Reference notes: [linux-version-2.2.1xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/latest.version [linux-DEB-installer-2.2.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/dotnet-sdk-latest-x64.deb [linux-DEB-installer-checksum-2.2.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer-2.2.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb.sha +[linux-RPM-installer-2.2.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/dotnet-sdk-latest-x64.rpm [linux-RPM-installer-checksum-2.2.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/dotnet-sdk-latest-x64.rpm.sha [linux-targz-2.2.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum-2.2.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.2.1xx/dotnet-sdk-latest-linux-x64.tar.gz.sha From e3cd8963cb27db80ceb7532afe2d1b37710462d8 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 27 Nov 2018 12:27:01 -0800 Subject: [PATCH 06/15] Update templates --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dbb8b4c64..40210678d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -27,7 +27,7 @@ 1.0.2-beta4-20181001-2078020 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta4-20180821-1966911 + 1.0.2-beta4-20181021-2140732 0.2.0 1.5.1 From 6d65d3740da6a2557b118eb886cf5c53f0d3540a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 27 Nov 2018 13:31:58 -0800 Subject: [PATCH 07/15] Update aspnet to 3.0.0-preview-18577-0031 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dbb8b4c64..e71ea3661 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ - 3.0.0-preview-18572-0018 + 3.0.0-preview-18577-0031 $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) From 3ac18fd42fab5c7f5944dcd0dc744269abb16889 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 27 Nov 2018 14:20:04 -0800 Subject: [PATCH 08/15] Update toolset Includes dotnet/toolset#47 to fix aspnet/AspNetCore#4241 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e71ea3661..75487f929 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009724 + 3.0.100-preview-009726 From 71c6b02460abe12b4de4f8894daf8fef95367fcc Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 27 Nov 2018 15:45:02 -0800 Subject: [PATCH 09/15] Update toolset --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 75487f929..c4f3736b7 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009726 + 3.0.100-preview-009728 From 21ccaebeb3fd5a33824252a049d94646ffc5a49b Mon Sep 17 00:00:00 2001 From: Rob LaDuca Date: Wed, 28 Nov 2018 14:12:11 -0800 Subject: [PATCH 10/15] Updating WindowsDesktop package version to 3.0.0-alpha-27128-4 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 45b10fad1..d2ee80e46 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -41,7 +41,7 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 3.0.0-alpha-27122-4 + 3.0.0-alpha-27128-4 $(MicrosoftWindowsDesktopPackageVersion) $(MicrosoftWindowsDesktopPackageVersion) From 28e864db34bfd08a66dd612cbb8cbe19bb6ef3f3 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 28 Nov 2018 17:20:18 -0800 Subject: [PATCH 11/15] Updating toolset version to 3.0.100-preview-009730 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d2ee80e46..ac24ab532 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009728 + 3.0.100-preview-009730 From a5853279a88356ed43c15a4963a6ccd4f4278fa6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 28 Nov 2018 18:03:18 -0800 Subject: [PATCH 12/15] Update aspnet to 3.0.0-preview-18579-0053 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ac24ab532..26625c4ec 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ - 3.0.0-preview-18577-0031 + 3.0.0-preview-18579-0053 $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) From 9996629b3c13f4cf8300b1c91c1e5e1e3a3c8ed3 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 28 Nov 2018 18:35:25 -0800 Subject: [PATCH 13/15] Updating toolset to 3.0.100-preview-009731 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 26625c4ec..e7c2c733e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009730 + 3.0.100-preview-009731 From 32a0fa70f7df33ae973ff35970d9e6131fedda0b Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 28 Nov 2018 20:39:37 -0800 Subject: [PATCH 14/15] Replace private System.AppDomain reflection with a regular call Fixes dotnet/cli#10399 --- TestAssets/TestPackages/dotnet-portable/Program.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-portable/Program.cs b/TestAssets/TestPackages/dotnet-portable/Program.cs index 1c8fb26e7..02d81ba5c 100644 --- a/TestAssets/TestPackages/dotnet-portable/Program.cs +++ b/TestAssets/TestPackages/dotnet-portable/Program.cs @@ -13,19 +13,10 @@ namespace ConsoleApplication { Console.WriteLine("Hello Portable World!"); - var depsFile = new FileInfo(GetDataFromAppDomain("FX_DEPS_FILE")); + var depsFile = new FileInfo(AppContext.GetData("FX_DEPS_FILE") as string); string frameworkVersion = depsFile.Directory.Name; Console.WriteLine($"I'm running on shared framework version {frameworkVersion}!"); } - - public static string GetDataFromAppDomain(string propertyName) - { - var appDomainType = typeof(object).GetTypeInfo().Assembly?.GetType("System.AppDomain"); - var currentDomain = appDomainType?.GetProperty("CurrentDomain")?.GetValue(null); - var deps = appDomainType?.GetMethod("GetData")?.Invoke(currentDomain, new[] { propertyName }); - - return deps as string; - } } } From 7b9a758e3157c63d1d2d3f344dcbbfa9db2ccf54 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 29 Nov 2018 16:03:55 -0800 Subject: [PATCH 15/15] Update aspnetcore to 3.0.0-preview-18579-0056 and toolset to 3.0.100-preview-009732 --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e7c2c733e..006f9f64a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009731 + 3.0.100-preview-009732 @@ -11,7 +11,7 @@ - 3.0.0-preview-18579-0053 + 3.0.0-preview-18579-0056 $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion)