diff options
author | DotNet Bot <dn-bot@microsoft.com> | 2021-04-16 02:10:49 +0300 |
---|---|---|
committer | DotNet Bot <dn-bot@microsoft.com> | 2021-04-16 02:10:49 +0300 |
commit | 8ca3954ca335343ce6dd1d14d8d1c6c3369710b7 (patch) | |
tree | f42b047f4b659e44596f03dc43559ce2b7830621 | |
parent | b467b1f1c53a1317dac60ddcc7d6d9799f078969 (diff) |
[internal/release/3.1] Update dependencies from dnceng/internal/dotnet-aspnetcore-toolingv3.1.15
- Fix tests
- Fixup nuget config
- Merge remote-tracking branch 'origin/internal/release/3.1' into darc-internal/release/3.1-abb7ce07-c2cf-48b4-83cf-58ca4dbabd3d
4 files changed, 9 insertions, 105 deletions
diff --git a/NuGet.config b/NuGet.config index 8976514f21..a814104b79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-aspnetcore-tooling --> - <add key="darc-int-dotnet-aspnetcore-tooling-fd6e751" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-fd6e7516/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-tooling-b4f2d74" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-b4f2d743/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore-tooling --> <!-- Begin: Package sources from dotnet-corefx --> <!-- End: Package sources from dotnet-corefx --> @@ -29,116 +29,18 @@ <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-extensions --> <add key="darc-int-dotnet-extensions-194782e" value="true" /> - <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> - <add key="darc-int-dotnet-extensions-4210e7d" value="true" /> - <add key="darc-int-dotnet-extensions-4210e7d" value="true" /> <!-- End: Package sources from dotnet-extensions --> <!-- Begin: Package sources from dotnet-aspnetcore-tooling --> - <add key="darc-int-dotnet-aspnetcore-tooling-fd6e751" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-aec2954" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-8d3c2f0" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-46eb078" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-bcc2619" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-814651c" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-a2af81e" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-7f55323" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-c493ee9" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" /> - <add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" /> + <add key="darc-int-dotnet-aspnetcore-tooling-b4f2d74" value="true" /> <!-- End: Package sources from dotnet-aspnetcore-tooling --> <!-- Begin: Package sources from dotnet-efcore --> <add key="darc-int-dotnet-efcore-f270203" value="true" /> - <add key="darc-int-dotnet-efcore-f270203" value="true" /> - <add key="darc-int-dotnet-efcore-390084d" value="true" /> - <add key="darc-int-dotnet-efcore-6821377" value="true" /> - <add key="darc-int-dotnet-efcore-910ba98" value="true" /> - <add key="darc-int-dotnet-efcore-bf84fa2" value="true" /> - <add key="darc-int-dotnet-efcore-fa09a74" value="true" /> - <add key="darc-int-dotnet-efcore-b8d54ba" value="true" /> - <add key="darc-int-dotnet-efcore-0028304" value="true" /> - <add key="darc-int-dotnet-efcore-bfc42ca" value="true" /> - <add key="darc-int-dotnet-efcore-315fdb4" value="true" /> - <add key="darc-int-dotnet-efcore-758635a" value="true" /> - <add key="darc-int-dotnet-efcore-6b2b25d" value="true" /> - <add key="darc-int-dotnet-efcore-84cb01f" value="true" /> - <add key="darc-int-dotnet-efcore-316acfe" value="true" /> - <add key="darc-int-dotnet-efcore-cdc92f1" value="true" /> - <add key="darc-int-dotnet-efcore-986705d" value="true" /> - <add key="darc-int-dotnet-efcore-cc1281b" value="true" /> - <add key="darc-int-dotnet-efcore-bc70740" value="true" /> - <add key="darc-int-dotnet-efcore-7dc9391" value="true" /> - <add key="darc-int-dotnet-efcore-57a08da" value="true" /> - <add key="darc-int-dotnet-efcore-716b9a3" value="true" /> - <add key="darc-int-dotnet-efcore-21ecf99" value="true" /> - <add key="darc-int-dotnet-efcore-21ecf99" value="true" /> - <add key="darc-int-dotnet-efcore-21ecf99" value="true" /> - <add key="darc-int-dotnet-efcore-251e53f" value="true" /> - <add key="darc-int-dotnet-efcore-0538c82" value="true" /> - <add key="darc-int-dotnet-efcore-f67b6e3" value="true" /> - <add key="darc-int-dotnet-efcore-591ae9d" value="true" /> - <add key="darc-int-dotnet-efcore-c5fbb99" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-5b7fc58" value="true" /> - <add key="darc-int-dotnet-efcore-d078590" value="true" /> - <add key="darc-int-dotnet-efcore-d078590" value="true" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-core-setup --> <add key="darc-int-dotnet-core-setup-dc339bd" value="true" /> - <add key="darc-int-dotnet-core-setup-826c2c2" value="true" /> - <add key="darc-int-dotnet-core-setup-d0e340e" value="true" /> - <add key="darc-int-dotnet-core-setup-d0e340e" value="true" /> - <add key="darc-int-dotnet-core-setup-d0e340e" value="true" /> - <add key="darc-int-dotnet-core-setup-c256022" value="true" /> - <add key="darc-int-dotnet-core-setup-8463a94" value="true" /> - <add key="darc-int-dotnet-core-setup-9f34d80" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-64df28e" value="true" /> - <add key="darc-int-dotnet-core-setup-0267ad0" value="true" /> - <add key="darc-int-dotnet-core-setup-0267ad0" value="true" /> <!-- End: Package sources from dotnet-core-setup --> <!-- Begin: Package sources from dotnet-corefx --> - <add key="darc-int-dotnet-corefx-6e37696" value="true" /> - <add key="darc-int-dotnet-corefx-9f21c83" value="true" /> - <add key="darc-int-dotnet-corefx-9f21c83" value="true" /> - <add key="darc-int-dotnet-corefx-f12876b" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-9299d90" value="true" /> - <add key="darc-int-dotnet-corefx-50a99d5" value="true" /> - <add key="darc-int-dotnet-corefx-50a99d5" value="true" /> <!-- End: Package sources from dotnet-corefx --> + <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> </configuration> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adf6170e3..de0c8dbdc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,19 +19,19 @@ </Dependency> <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> - <Sha>fd6e7516ef0f4d858b5fa2737791f1e208010a15</Sha> + <Sha>b4f2d7437db4b5f36375cfcf1de316e3e42fcee6</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> - <Sha>fd6e7516ef0f4d858b5fa2737791f1e208010a15</Sha> + <Sha>b4f2d7437db4b5f36375cfcf1de316e3e42fcee6</Sha> </Dependency> <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.1.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> - <Sha>fd6e7516ef0f4d858b5fa2737791f1e208010a15</Sha> + <Sha>b4f2d7437db4b5f36375cfcf1de316e3e42fcee6</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> - <Sha>fd6e7516ef0f4d858b5fa2737791f1e208010a15</Sha> + <Sha>b4f2d7437db4b5f36375cfcf1de316e3e42fcee6</Sha> </Dependency> <Dependency Name="dotnet-ef" Version="3.1.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj index f6a0faf5e3..3ef6668f3e 100644 --- a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj +++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj @@ -11,6 +11,7 @@ <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" /> <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" /> <Reference Include="Microsoft.CodeAnalysis.CSharp" /> + <Reference Include="System.Text.Json" /> </ItemGroup> <ItemGroup> diff --git a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj index 6450d01d8a..885b11d924 100644 --- a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj +++ b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj @@ -9,6 +9,7 @@ <ItemGroup> <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" /> <Reference Include="Microsoft.CodeAnalysis.CSharp" /> + <Reference Include="System.Text.Json" /> </ItemGroup> </Project> |