From 5b30797592bf5f1619a093368038bf71f3f6fd1f Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 12 Nov 2019 16:16:40 +0000 Subject: [PATCH 1/3] Blazor WebAssembly move to netstandard2.1 (#16808) * Now works on ns2.1, but links too much * Now only link System.* assemblies * Clean up. Also link Microsoft.Extensions.* now too, since it works. * x-plat slash consistency * Change all Blazor.* projects to netstandard2.1 * Further TFM updates * Stop linking Microsoft.Extensions for now, since it requires a more detailed treatment to avoid breaking things --- .../ref/Microsoft.AspNetCore.Blazor.csproj | 6 +++--- ...rosoft.AspNetCore.Blazor.netstandard2.1.cs} | 0 .../src/Microsoft.AspNetCore.Blazor.csproj | 2 +- .../src/targets/Blazor.MonoRuntime.targets | 18 +++++++++++++++--- ...crosoft.AspNetCore.Blazor.HttpClient.csproj | 6 +++--- ...etCore.Blazor.HttpClient.netstandard2.1.cs} | 0 ...crosoft.AspNetCore.Blazor.HttpClient.csproj | 2 +- .../Client/BlazorWasm-CSharp.Client.csproj | 2 +- .../Shared/BlazorWasm-CSharp.Shared.csproj | 2 +- ...re.Blazor.DataAnnotations.Validation.csproj | 2 +- .../HostedInAspNet.Client.csproj | 2 +- ...oft.AspNetCore.Blazor.E2EPerformance.csproj | 2 +- .../MonoSanityClient/MonoSanityClient.csproj | 2 +- .../StandaloneApp/StandaloneApp.csproj | 2 +- .../BasicTestApp/BasicTestApp.csproj | 2 +- 15 files changed, 31 insertions(+), 19 deletions(-) rename src/Components/Blazor/Blazor/ref/{Microsoft.AspNetCore.Blazor.netstandard2.0.cs => Microsoft.AspNetCore.Blazor.netstandard2.1.cs} (100%) rename src/Components/Blazor/Http/ref/{Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs => Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.1.cs} (100%) diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj index d750edc189..88ca078caa 100644 --- a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj +++ b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj @@ -1,10 +1,10 @@ - netstandard2.0 + netstandard2.1 - - + + diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.1.cs similarity index 100% rename from src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs rename to src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.1.cs diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj index 0673c85b2d..be94e420a2 100644 --- a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj +++ b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 Build client-side single-page applications (SPAs) with Blazor running under WebAssembly. true diff --git a/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets index 69976d519b..b2de5481db 100644 --- a/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets +++ b/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets @@ -421,11 +421,23 @@ has changed. 4) Add the file we just created to the list of file writes, to support incremental builds. --> + + <_BlazorDependencyAssembly Include="@(_BlazorDependencyInput)"> + $([System.String]::Copy('%(RelativeDir)').TrimEnd('\').TrimEnd('/')) + true + + <_MonoBaseClassLibraryFolder Include="$(MonoBaseClassLibraryPath);$(MonoBaseClassLibraryFacadesPath);$(MonoWasmFrameworkPath)" /> - <_BlazorAssembliesToLink Include="@(_BlazorDependencyInput->'-a "%(Identity)"')" /> - <_BlazorAssembliesToLink Include="@(IntermediateAssembly->'-a "%(FullPath)"')" /> + <_BlazorAssembliesToCopy Include="@(IntermediateAssembly->'-a "%(FullPath)"')" /> <_BlazorFolderLookupPaths Include="@(_MonoBaseClassLibraryFolder->'-d "%(Identity)"')" /> + + + <_BlazorFolderLookupPaths Condition="'%(_BlazorDependencyAssembly.IsLinkable)' == 'true'" Include="@(_BlazorDependencyAssembly->'-d "%(RelativeDirNoTrailingSlash)"')" /> + + + <_BlazorAssembliesToCopy Condition="'%(_BlazorDependencyAssembly.IsLinkable)' != 'true'" Include="@(_BlazorDependencyAssembly->'-a "%(FullPath)"')" /> + <_BlazorAssemblyDescriptorFiles Include="@(BlazorLinkerDescriptor->'-x "%(FullPath)"')" Condition="'@(BlazorLinkerDescriptor)' != ''" /> @@ -438,7 +450,7 @@ - + diff --git a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj b/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj index 8c5f6d9e13..6a3ca4305d 100644 --- a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj +++ b/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj @@ -1,10 +1,10 @@ - netstandard2.0 + netstandard2.1 - - + + diff --git a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs b/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.1.cs similarity index 100% rename from src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs rename to src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.1.cs diff --git a/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj b/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj index 18bdc5e1fe..be140d936e 100644 --- a/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj +++ b/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 Provides experimental support for using System.Text.Json with HttpClient. Intended for use with Blazor running under WebAssembly. true diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj index c4eb65bded..c855c49821 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 3.0 diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Shared/BlazorWasm-CSharp.Shared.csproj b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Shared/BlazorWasm-CSharp.Shared.csproj index 2a77f0c7cc..d849ca9036 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Shared/BlazorWasm-CSharp.Shared.csproj +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Shared/BlazorWasm-CSharp.Shared.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 7.3 diff --git a/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj b/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj index a166d5f1f3..725b1f9811 100644 --- a/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj +++ b/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 Provides experimental support for validation using DataAnnotations. true false diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj index ef12ac3c4e..cb21b79a8c 100644 --- a/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 Exe true 3.0 diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj index 9f796fdbcf..140762810f 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 true 3.0 diff --git a/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj b/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj index b186c39194..e01c600843 100644 --- a/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj +++ b/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 false false exe diff --git a/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj b/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj index cddd429b6a..32156c56b8 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj +++ b/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 true 3.0 diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 98357d0e88..9914ec4521 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 3.0 true From 23f9a9ea13d04ae165c3fd7a987a502c3e68fd64 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Wed, 13 Nov 2019 18:06:37 -0800 Subject: [PATCH 2/3] Revert "Keep Blazor at pre-release for 3.1" This reverts commit e7e29105ccb1ede074052b8460474b8836c0a27f. --- eng/Versions.props | 3 --- src/Components/Blazor/Directory.Build.props | 9 --------- 2 files changed, 12 deletions(-) delete mode 100644 src/Components/Blazor/Directory.Build.props diff --git a/eng/Versions.props b/eng/Versions.props index 09645f97c4..93c01fb584 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,9 +19,6 @@ false preview$(PreReleasePreviewNumber) Preview $(PreReleasePreviewNumber) - - 4 - preview$(BlazorClientPreReleasePreviewNumber) $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) false diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.props deleted file mode 100644 index a90d83b4cc..0000000000 --- a/src/Components/Blazor/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - $(BlazorClientPreReleaseVersionLabel) - - - From a53addc1fea197707a1a283868862c46bb2b95c0 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Wed, 13 Nov 2019 18:09:42 -0800 Subject: [PATCH 3/3] Revert dependency updates from 3.1 merge --- NuGet.config | 5 - eng/Version.Details.xml | 400 ++++++++++++++++++++-------------------- eng/Versions.props | 202 ++++++++++---------- 3 files changed, 301 insertions(+), 306 deletions(-) diff --git a/NuGet.config b/NuGet.config index 362df7f886..5d28b80a6f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,12 +3,7 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b253097c4..54509fa033 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,393 +9,393 @@ --> - + https://github.com/aspnet/Blazor - c8cc48b96c4ef3405dfc1678b089650aec2845ff + df77420cad90b1834fe43c952861dad11097d38f - + https://github.com/aspnet/AspNetCore-Tooling - d29aca1669a58a198445845c53a1e5792d6a6593 + 542a22f0b0242fc7247884b316c71e921d9711da - + https://github.com/aspnet/AspNetCore-Tooling - d29aca1669a58a198445845c53a1e5792d6a6593 + 542a22f0b0242fc7247884b316c71e921d9711da - + https://github.com/aspnet/AspNetCore-Tooling - d29aca1669a58a198445845c53a1e5792d6a6593 + 542a22f0b0242fc7247884b316c71e921d9711da - + https://github.com/aspnet/AspNetCore-Tooling - d29aca1669a58a198445845c53a1e5792d6a6593 + 542a22f0b0242fc7247884b316c71e921d9711da - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - 593a3807085dab72170dba95f9283e244961f5db + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 https://github.com/dotnet/core-setup @@ -404,13 +404,13 @@ - + https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 https://github.com/dotnet/arcade @@ -424,13 +424,13 @@ https://github.com/dotnet/arcade a42a124635ce1a218309ecb31ec59d559cacb886 - + https://github.com/aspnet/Extensions - c273f3c664433d1b6dd2c107adaf8270e9448c01 + 02e6d683074019728bfbda8e40e526606fd12875 - + https://github.com/dotnet/roslyn - 1cb14195ed43eefdf7f9de59140ff6db70eea76e + dd838b6fc2ed66913ad99a1a7d58b1b1c07530ed diff --git a/eng/Versions.props b/eng/Versions.props index 93c01fb584..fd988d11b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - true + false release true false @@ -64,114 +64,114 @@ 1.0.0-beta.19517.3 - 3.4.0-beta4-19562-01 + 3.5.0-beta1-19551-03 - 3.1.0 - 3.1.0 - 3.1.0 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 2.1.0 - 1.1.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 1.8.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 - 4.7.0 + 1.1.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 1.8.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 + 4.7.0-preview3.19551.4 - 3.1.0 + 3.1.0-preview3.19551.4 - 3.1.0-preview4.19562.1 + 3.1.0-preview3.19531.1 - 3.1.0-preview3.19562.4 - 3.1.0-preview3.19562.4 - 3.1.0-preview3.19562.4 - 3.1.0-preview3.19562.4 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0-preview3.19562.4 - 3.1.0 - 3.1.0-preview3.19562.4 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 + 3.1.0-preview3.19553.1 + 3.1.0-preview3.19553.1 + 3.1.0-preview3.19553.1 + 3.1.0-preview3.19553.1