Skip to content

Purge the blazor-wasm branch #18770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 7, 2020
Merged

Purge the blazor-wasm branch #18770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f54902f
Purge the blazor-wasm branch
pranavkm Feb 3, 2020
af8aa0f
Fixup error on SDK restore
pranavkm Feb 4, 2020
65fb07f
Also Versions.Details.xml
pranavkm Feb 4, 2020
58fd885
Undo changes to baseline
pranavkm Feb 5, 2020
96db485
Remove extra sln
pranavkm Feb 5, 2020
9450e95
Merge branch 'blazor-wasm' into prkrishn/purge
pranavkm Feb 5, 2020
ac15a78
Let's try this
pranavkm Feb 5, 2020
dd89333
Pin all the things
pranavkm Feb 5, 2020
6a522be
Fixup
pranavkm Feb 5, 2020
63f28f7
fixup2
pranavkm Feb 5, 2020
2562464
Skip installing dotnet on xplat
pranavkm Feb 5, 2020
aa2d105
Workaround analyzer
pranavkm Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="aspnetcore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.102-servicing-014873/nuget/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
Expand Down
6 changes: 6 additions & 0 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,12 @@ try {

$toolsetBuildProj = InitializeToolset

$dotnetInstallDir = Join-Path $RepoRoot ".dotnet"
$sdkPath = [IO.Path]::Combine($dotnetInstallDir, 'sdk', '3.1.102')
if (!(Test-Path $sdkPath)) {
InstallDotNetSdk $dotnetInstallDir '3.1.102-servicing-014873' -skipNonVersionedFiles $true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this branch is still around for 3.1.103, will this workaround go away or need to be updated?

}

$restore = $tmpRestore

if ($ci) {
Expand Down
5 changes: 5 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,11 @@ restore=true

InitializeToolset

dotnet_install_dir="$repo_root/.dotnet"
if [[ ! -d "$dotnet_install_dir/sdk/3.1.102" ]]; then
InstallDotNetSdk "$dotnet_install_dir" "3.1.102-servicing-014873"
fi

restore=$_tmp_restore=

if [ "$build_repo_tasks" = true ]; then
Expand Down
436 changes: 219 additions & 217 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions eng/Baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,86 +4,86 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.

-->
<Baseline Version="3.1.0">
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.0" />
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.0" />
<Package Id="dotnet-sql-cache" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.0" />
<Baseline Version="3.1.1">
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.2" />
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.2" />
<Package Id="dotnet-sql-cache" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19465.2" />
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19465.2" />
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19465.2" />
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19465.2" />
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview9.19465.2" />
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.0.0-preview9.19465.2" />
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.0" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.0" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.0" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.0" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.0" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.0" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.0" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.0" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.0" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.0" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.0" />
</Baseline>
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.1" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.1" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.1" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.1" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.1" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.1" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.1" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.1" />
</Baseline>
10 changes: 10 additions & 0 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,16 @@ and are generated based on the last package release.
<LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" />
</ItemGroup>

<ItemGroup Label="AspNetCore">
<LatestPackageReference Include="Ignitor" Version="$(IgnitorPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Components" Version="$(MicrosoftAspNetCoreComponentsPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(MicrosoftAspNetCoreComponentsAuthorizationPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="$(MicrosoftAspNetCoreComponentsFormsPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(MicrosoftAspNetCoreComponentsWebPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
</ItemGroup>

<ItemGroup Label="MSBuild">
<LatestPackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
<LatestPackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
Expand Down
Loading