diff --git a/README.md b/README.md index efd840218..31aa0c7a7 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. @@ -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 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; - } } } diff --git a/eng/Versions.props b/eng/Versions.props index 1f68f0c1a..bef91efb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009724 + 3.0.100-preview-009732 @@ -11,7 +11,7 @@ - 3.0.0-preview-18572-0018 + 3.0.0-preview-18579-0056 $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) @@ -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 @@ -38,7 +38,7 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 3.0.0-alpha-27122-4 + 3.0.0-alpha-27128-4 $(MicrosoftWindowsDesktopPackageVersion) $(MicrosoftWindowsDesktopPackageVersion) diff --git a/old/build/BundledRuntimes.props b/old/build/BundledRuntimes.props index 8c1145d1b..5c1bed87d 100644 --- a/old/build/BundledRuntimes.props +++ b/old/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) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 32686a699..4ae8a05b5 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.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 5e3a8ad6d..b5f9ca69d 100644 --- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs +++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs @@ -220,8 +220,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" }; }