From 8f59b0c6230487a3472ca75755c7f1fda1e6789e Mon Sep 17 00:00:00 2001 From: "Doug Bunting (AAPT)" Date: Fri, 12 Feb 2021 21:12:49 +0000 Subject: [PATCH 01/12] Merged PR 12859: [release/2.1] Unpin System.Text.Encodings.Web - patched in this release --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 9598c5541b33..8d8364098771 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,6 +4,7 @@ 2.1.23 2.1.23 + 4.5.0 @@ -203,7 +204,6 @@ 4.5.0 4.5.1 4.5.0 - 4.5.0 4.5.0 4.9.0 4.5.4 From 604efe7ee04314d65f3f6e150d59eb3833ab7edd Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 18 Feb 2021 22:13:52 +0000 Subject: [PATCH 02/12] Merged PR 13056: Patch packages that depend on System.Text.Encodings.Web Will also get S.T.E.W included in the Shared Framework --- eng/PatchConfig.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 708e392de656..80f1ba3859ee 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -92,6 +92,9 @@ Later on, this will be checked using this condition: @aspnet/signalr; @aspnet/signalr-protocol-msgpack; + Microsoft.AspNetCore.WebUtilities; + Microsoft.AspNetCore.Http.Abstractions; + Microsoft.AspNetCore.Html.Abstractions; From f7e5194202725c4901492fecd711646ed599e905 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 19 Feb 2021 00:03:08 +0000 Subject: [PATCH 03/12] Merged PR 13057: Add direct reference to S.T.E.W for Razor test projects Should fix reference resolution errors in Razor SDK projects. As far as I can tell this is the only external reference we need to add here (other references are to projects in the repo) --- src/Razor/Razor.Design/test/testassets/Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Razor/Razor.Design/test/testassets/Directory.Build.props b/src/Razor/Razor.Design/test/testassets/Directory.Build.props index 96496c0d2856..a6d8780b8a32 100644 --- a/src/Razor/Razor.Design/test/testassets/Directory.Build.props +++ b/src/Razor/Razor.Design/test/testassets/Directory.Build.props @@ -28,6 +28,8 @@ + + From 2e56411fe66eec8421e741ba02454b77e09b7719 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 19 Feb 2021 01:08:05 +0000 Subject: [PATCH 04/12] Reference .dll directly --- src/Razor/Razor.Design/test/testassets/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Razor/Razor.Design/test/testassets/Directory.Build.props b/src/Razor/Razor.Design/test/testassets/Directory.Build.props index a6d8780b8a32..08f97a7b3ace 100644 --- a/src/Razor/Razor.Design/test/testassets/Directory.Build.props +++ b/src/Razor/Razor.Design/test/testassets/Directory.Build.props @@ -28,8 +28,7 @@ - - + From 013de6365b4cdac816833296f4dae0f6a955a4d5 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 19 Feb 2021 22:30:45 +0000 Subject: [PATCH 05/12] Merged PR 13067: Try setting metadata for S.T.E.W --- build/external-dependencies.props | 2 +- eng/PatchConfig.props | 3 --- src/Razor/Razor.Design/test/testassets/Directory.Build.props | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 7e80a4cef626..dd32d960f16d 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -207,7 +207,7 @@ - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 80f1ba3859ee..708e392de656 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -92,9 +92,6 @@ Later on, this will be checked using this condition: @aspnet/signalr; @aspnet/signalr-protocol-msgpack; - Microsoft.AspNetCore.WebUtilities; - Microsoft.AspNetCore.Http.Abstractions; - Microsoft.AspNetCore.Html.Abstractions; diff --git a/src/Razor/Razor.Design/test/testassets/Directory.Build.props b/src/Razor/Razor.Design/test/testassets/Directory.Build.props index 08f97a7b3ace..96496c0d2856 100644 --- a/src/Razor/Razor.Design/test/testassets/Directory.Build.props +++ b/src/Razor/Razor.Design/test/testassets/Directory.Build.props @@ -28,7 +28,6 @@ - From bdd5c49e561c1fd3cedcfe98fc7f0a16fe3bc75e Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 9 Mar 2021 10:21:33 -0800 Subject: [PATCH 06/12] Update baseline and SDK --- eng/Baseline.Designer.props | 2 +- eng/Baseline.xml | 2 +- korebuild-lock.txt | 4 ++-- version.props | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index e9d5ae0b60f1..17d630ae7d28 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.25 + 2.1.26 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 072ee149e95b..a965010661e4 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b10f4b294ddd..4ebdda95e912 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.7-build-20210209.2 -commithash:e2b019a5c8d338b060644e2ea5437beea1f5a888 +version:2.1.7-build-20210309.1 +commithash:661bf72b3a220a08f26c1919c6f33113e894466d diff --git a/version.props b/version.props index 3f18cada9a36..1cb6bef23f0e 100644 --- a/version.props +++ b/version.props @@ -3,7 +3,7 @@ 2 1 27 - false + true servicing Servicing From 69ad16ca29f0128954f9cc362c5953fd2f219ec6 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 9 Mar 2021 10:54:34 -0800 Subject: [PATCH 07/12] Repin STEW --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 8d8364098771..4e331dfa4d9d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,7 +4,6 @@ 2.1.23 2.1.23 - 4.5.0 @@ -204,6 +203,7 @@ 4.5.0 4.5.1 4.5.0 + 4.5.1 4.5.0 4.9.0 4.5.4 From 2834542bd18ab968f303044b4bfb0f656a1fd416 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 3 Mar 2021 19:35:51 -0800 Subject: [PATCH 08/12] Split UnitTests/net461 up more - need more assemblies in `--TestAdapterPath` command-line argument --- .../Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj | 1 + .../test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj | 1 + ...rosoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj index 3478f3fdb782..ca2650e53600 100644 --- a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj +++ b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj @@ -2,6 +2,7 @@ netcoreapp2.1;net461 + Hosting.Tests diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj index d40f17e64ac4..5dae3cd340c6 100644 --- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj @@ -3,6 +3,7 @@ netcoreapp2.1;net461 true + Kestrel.Tests diff --git a/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj b/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj index 4aa1f389e4cd..21a58c3c63b8 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj +++ b/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj @@ -4,6 +4,7 @@ netcoreapp2.1;net461 true true + Kestrel.Tests From 17ba50c9f4f136218ee34d02a27af07c127266eb Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 19:38:50 -0800 Subject: [PATCH 09/12] [release/2.1] Fixup NPM package versioning (#30164) - `_Pack` target failing in ProdCon builds - fortunately problem is specific to non-`IsFinalBuild` builds - don't add the version metadata because that's not written into package.lock - e.g. looking for aspnet-signalr-protocol-msgpack-1.0.26-servicing-20210212.12+pb-20210212-02.tgz - but `npm pack` actually wrote aspnet-signalr-protocol-msgpack-1.0.26-servicing-20210212.12.tgz - see https://dnceng.visualstudio.com/internal/_build/results?buildId=992921&view=logs&j=f31c9f97-4411-58e7-49ac-fc73f645e6b6&t=2bcaa12b-2f4b-5b1f-c519-10308f653190&l=3190 --- version.props | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/version.props b/version.props index 1cb6bef23f0e..0d65929671e4 100644 --- a/version.props +++ b/version.props @@ -39,7 +39,9 @@ $(ExperimentalVersionPrefix)-$(VersionSuffix) pb-$(DotNetProductBuildId) - $(VersionSuffix)+$(VersionMetadata) + + + $(VersionSuffix)+$(VersionMetadata) release/$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) From b9baf8cf8b90135278b26b92075bb373f6418603 Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 10 Mar 2021 09:51:29 -0800 Subject: [PATCH 10/12] 2.1 SignalR npm readme (#30271) * Update README.md * Update README.md * Update PatchConfig.props --- eng/PatchConfig.props | 2 ++ src/SignalR/clients/ts/signalr-protocol-msgpack/README.md | 4 ++++ src/SignalR/clients/ts/signalr/README.md | 2 ++ 3 files changed, 8 insertions(+) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 87d7cdf0c621..04811d69264e 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -96,6 +96,8 @@ Later on, this will be checked using this condition: + @aspnet/signalr; + @aspnet/signalr-protocol-msgpack; diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md b/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md index c1912b6d3a51..0dafe8064797 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md @@ -1,5 +1,9 @@ MsgPack support for SignalR for ASP.NET Core +> :warning: This package will no longer be supported starting August 21, 2021. This package follows the [.NET Core 2.1 support lifecycle](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) which is ending soon. Please transition to using [@microsoft/signalr-protocol-msgpack](https://www.npmjs.com/package/@microsoft/signalr-protocol-msgpack) as described below. + +> Note: The JavaScript and TypeScript clients for SignalR for ASP.NET Core have been moved to [@microsoft/signalr-protocol-msgpack](https://www.npmjs.com/package/@microsoft/signalr-protocol-msgpack). If you are already using `@aspnet/signalr-protocol-msgpack` and are unsure when to move to `@microsoft/signalr-protocol-msgpack`, check the [Feature Distribution](https://docs.microsoft.com/en-us/aspnet/core/signalr/client-features) chart in the ASP.NET Core SignalR documentation. Newer client releases are compatible with older version of ASP.NET Core SignalR which means it is safe to upgrade the client before upgrading the server. + ## Installation ```bash diff --git a/src/SignalR/clients/ts/signalr/README.md b/src/SignalR/clients/ts/signalr/README.md index 8015ef00dac0..78b72b8c44e6 100644 --- a/src/SignalR/clients/ts/signalr/README.md +++ b/src/SignalR/clients/ts/signalr/README.md @@ -1,5 +1,7 @@ JavaScript and TypeScript clients for SignalR for ASP.NET Core +> :warning: This package will no longer be supported starting August 21, 2021. This package follows the [.NET Core 2.1 support lifecycle](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) which is ending soon. Please transition to using [@microsoft/signalr](https://www.npmjs.com/package/@microsoft/signalr) as described below. + > Note: The JavaScript and TypeScript clients for SignalR for ASP.NET Core have been moved to [@microsoft/signalr](https://www.npmjs.com/package/@microsoft/signalr). If you are already using `@aspnet/signalr` and are unsure when to move to `@microsoft/signalr`, check the [Feature Distribution](https://docs.microsoft.com/en-us/aspnet/core/signalr/client-features) chart in the ASP.NET Core SignalR documentation. Newer client releases are compatible with older version of ASP.NET Core SignalR which means it is safe to upgrade the client before upgrading the server. ## Installation From bffb3ca4f947a46b5758be091f398bfcef354df1 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 12 Mar 2021 14:02:37 -0800 Subject: [PATCH 11/12] [release/2.1] Include transitive refs in meta-package .nuspec files (#30639) * Correct and streamline internal builds - correct manual internal builds - need to explicitly set `$(BuildNumber)` property in all build steps - rename `$(BuildScriptArgs)` to avoid circular reference - skip tests by default in internal non-PR builds nits: - include new `$(BuildNumberArg)` in `$(SharedFxArgs)` - run all test jobs in internal pull requests * Always skip tests in SharedFx and later jobs - however test\SharedFx.UnitTests\SharedFx.UnitTests.csproj always runs as part of `BuildSharedFx` target * Include transitive refs in meta-package .nuspec files - #30279 - ensure dependencies are up-to-date even when PatchConfig.props is empty - change only CoreFx and core-setup dependencies - also change transitive references that weren't mentioned before * Bump a few patch versions --- .azure/pipelines/ci.yml | 49 +++++++++------ build/dependencies.props | 21 ++++--- build/external-dependencies.props | 99 ++++++++++++++++--------------- 3 files changed, 97 insertions(+), 72 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 8437936e9b54..209f247241a6 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -20,16 +20,17 @@ variables: - name: TeamName value: AspNetCore - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - name: BuildScriptArgs + - name: BuildNumberArg value: '' - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - name: BuildScriptArgs + - name: BuildNumberArg value: '/p:BuildNumber=$(Build.BuildId)' - name: SharedFxArgs value: '/t:Prepare /t:Restore /t:GeneratePropsFiles - /t:BuildSharedFx' + /t:BuildSharedFx + $(BuildNumberArg)' jobs: - template: jobs/default-build.yml @@ -37,22 +38,29 @@ jobs: jobName: Windows_Build jobDisplayName: "Build and test: Windows" agentOs: Windows + buildArgs: $(BuildNumberArg) codeSign: true beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1" displayName: Setup IISExpress test certificates -# Unix test jobs only run on public CI builds -- ${{ if eq(variables['System.TeamProject'], 'public') }}: + # Skip tests by default in internal non-PR builds. + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + variables: + PB_SKIPTESTS: ${{ coalesce(variables.PB_SKIPTESTS, 'true') }} +# Unix test jobs only run on public CI builds and PRs +- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - template: jobs/default-build.yml parameters: jobName: MacOs_Build jobDisplayName: "Build and test : MacOS" agentOs: MacOS + buildArgs: $(BuildNumberArg) - template: jobs/default-build.yml parameters: jobName: Linux_Build jobDisplayName: "Build and test : Linux" agentOs: Linux + buildArgs: $(BuildNumberArg) - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - job: Windows_SharedFx @@ -67,6 +75,7 @@ jobs: variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -102,7 +111,6 @@ jobs: - script: .\build.cmd -ci /p:SignType=$(_SignType) - $(BuildScriptArgs) $(SharedFxArgs) /p:SharedFxRID=win-x64 /bl:artifacts/logs/SharedFx-win-x64.binlog @@ -118,7 +126,6 @@ jobs: - script: .\build.cmd -ci /p:SignType=$(_SignType) - $(BuildScriptArgs) $(SharedFxArgs) /p:SharedFxRID=win-x86 /bl:artifacts/logs/SharedFx-win-x86.binlog @@ -134,7 +141,7 @@ jobs: - script: .\build.cmd -ci /p:SignType=$(_SignType) - $(BuildScriptArgs) + $(BuildNumberArg) /p:SkipArtifactInfoTargets=true /p:DisableSignCheck=true /t:DoCodeSigning @@ -178,6 +185,8 @@ jobs: clean: all pool: vmImage: macOS-10.14 + variables: + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -198,7 +207,6 @@ jobs: targetFolder: $(Build.SourcesDirectory)/.deps/ - script: ./$(BuildDirectory)/build.sh -ci - $(BuildScriptArgs) $(SharedFxArgs) /p:SharedFxRID=osx-x64 /bl:artifacts/logs/SharedFx-osx-x64.binlog @@ -226,6 +234,8 @@ jobs: clean: all pool: vmImage: ubuntu-16.04 + variables: + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -246,7 +256,6 @@ jobs: targetFolder: $(Build.SourcesDirectory)/.deps/ - script: ./$(BuildDirectory)/build.sh -ci - $(BuildScriptArgs) $(SharedFxArgs) /p:SharedFXRid=linux-x64 /bl:artifacts/logs/SharedFx-linux-x64.binlog @@ -258,7 +267,6 @@ jobs: displayName: Build linux-x64 SharedFX - script: ./$(BuildDirectory)/build.sh -ci - $(BuildScriptArgs) $(SharedFxArgs) /p:SharedFXRid=linux-arm /p:IsLinuxArmSupported=true @@ -287,6 +295,8 @@ jobs: clean: all pool: vmImage: ubuntu-16.04 + variables: + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -308,7 +318,7 @@ jobs: - script: ./$(BuildDirectory)/dockerbuild.sh alpine -ci - $(BuildScriptArgs) + $(BuildNumberArg) /t:Prepare /t:GeneratePropsFiles /t:BuildSharedFx @@ -344,6 +354,7 @@ jobs: variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -421,6 +432,7 @@ jobs: variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -443,7 +455,7 @@ jobs: targetFolder: $(Build.SourcesDirectory)/.deps/Signed/ - script: .\build.cmd -ci - $(BuildScriptArgs) + $(BuildNumberArg) /p:SignType=$(_SignType) /t:BuildFallbackArchive /bl:artifacts/logs/PackageArchive.binlog @@ -468,7 +480,7 @@ jobs: - job: SharedFX_Installers displayName: Build SharedFX Installers - dependsOn: + dependsOn: - Linux_SharedFx - Linux_Musl_SharedFx - MacOs_SharedFx @@ -478,6 +490,8 @@ jobs: clean: all pool: vmImage: ubuntu-16.04 + variables: + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -531,7 +545,7 @@ jobs: targetFolder: $(Build.SourcesDirectory)/.deps/Signed/ - script: ./$(BuildDirectory)/build.sh -ci - $(BuildScriptArgs) + $(BuildNumberArg) /t:BuildInstallers /bl:artifacts/logs/SharedFx-Installers.binlog env: @@ -554,7 +568,7 @@ jobs: - job: Publish displayName: Publish - dependsOn: + dependsOn: - Windows_Installers - SharedFX_Installers - Package_Archive @@ -567,6 +581,7 @@ jobs: variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk + PB_SKIPTESTS: 'true' steps: - checkout: self clean: true @@ -703,7 +718,7 @@ jobs: contents: korebuild.json - script: .\build.cmd -ci - $(BuildScriptArgs) + $(BuildNumberArg) /t:Publish /p:BuildBranch=$(Build.SourceBranchName) /bl:artifacts/logs/Publish.binlog diff --git a/build/dependencies.props b/build/dependencies.props index 4e331dfa4d9d..21b767b43435 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -90,10 +90,10 @@ 2.1.1 2.1.1 0.5.1 - 2.1.4 - 2.1.4 - 2.1.4 - 2.1.4 + 2.1.14 + 2.1.14 + 2.1.14 + 2.1.14 0.9.9 @@ -132,11 +132,11 @@ 3.14.2 5.2.0 5.2.0 - 1.0.15 - 1.1.12 + 1.0.16 + 1.1.13 2.0.9 1.0.1 - 15.9.0 + 15.9.2 3.0.1 3.0.1 3.0.1 @@ -191,7 +191,7 @@ 4.5.4 4.5.4 4.3.4 - 4.5.3 + 4.5.4 4.5.0 3.1.1 4.3.0 @@ -230,5 +230,10 @@ 2.3.1 2.4.0 2.4.0 + + + 2.1.0 + 4.5.2 + 4.5.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index dd32d960f16d..94a77c83980f 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -16,53 +16,53 @@ - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + @@ -116,7 +116,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -195,20 +195,20 @@ - + - + - - + + - - + + @@ -222,6 +222,11 @@ + + + + + From fd7ee03a38fe1c30a4e3ef312505d3083df4658d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 12 Mar 2021 15:49:21 -0800 Subject: [PATCH 12/12] Add a bit more to Microsoft.AspNetCore.App.nuspec (#30895) - left 3 new transitive dependencies out of #30639 --- build/external-dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 94a77c83980f..2cfd584836f6 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -224,9 +224,9 @@ - - - + + +