Purge the blazor-wasm branch #18770

pranavkm · 2020-02-04T01:50:25Z

No description provided.

pranavkm · 2020-02-04T20:31:38Z

eng/common/tools.ps1

@@ -184,7 +183,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
  InstallDotNet $dotnetRoot $version $architecture
 }

-function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) {
+function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $true) {


This is to workaround the issue with installing the unstable version 3.1.102 SDK and calling build.cmd multiple times. We should be able to remove this once 3.1.102 ships \ dotnet-install can install unstable zips that contain stable SDKs or runtime as discussed in the email thread.

Any change made under eng/common/ will be obliterated as part of the next Arcade dependency update. We should never be editing these files except in short-term emergencies i.e. when we can't wait for an Arcade fix.

We should never be editing these files except in short-term

Yup. Like I said, we should be able to undo this once 3.1.102 ships, which is fairly soon, no?

February 18

pranavkm · 2020-02-04T20:33:30Z

src/Components/Blazor/Directory.Build.props

@@ -1,10 +1,4 @@
 <Project>
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
  <Import Project="Blazor.Version.props" />
-
-  <PropertyGroup>


This gets set by src/Components/Directory.Build.props

dougbu · 2020-02-05T00:31:24Z

eng/Baseline.Designer.props

@@ -2,146 +2,146 @@
 <Project>
  <PropertyGroup>
    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>3.1.0</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>3.1.2</AspNetCoreBaselineVersion>


This looks wrong because it doesn't align with Baseline.xml

dougbu · 2020-02-05T00:34:56Z

eng/Version.Details.xml

-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" Pinned="true">
-      <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>82c6ea483d3a17393dad5986df9a8eef89ddcd07</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.2">


Huh? Why isn't almost-every dependency in this file pinned?

Also:

doubt even 1/3 of these dependencies are needed

make sure none of the dependencies use CoherentParentDependency and Pinned together

I have no idea what Pinned means. I copied this file pretty-much as is from the release/3.1 branch.

This looks fine now. Because we don't have subscriptions from the extensions or efcore repo, Pinned is irrelevant. That is, unless you need to pin something coming from blazor, you could remove all Pinned attributes.

dougbu · 2020-02-05T00:41:45Z

eng/common/tools.ps1

@@ -184,7 +183,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
  InstallDotNet $dotnetRoot $version $architecture
 }

-function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) {
+function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $true) {


Any change made under eng/common/ will be obliterated as part of the next Arcade dependency update. We should never be editing these files except in short-term emergencies i.e. when we can't wait for an Arcade fix.

ryanbrandenburg

Am I reading this correctly that you've removed every template except for the blazor-wasm one? I don't really understand the context behind it, but if that's the intention you achieved it.

build.ps1

pranavkm · 2020-02-06T00:39:13Z

src/ProjectTemplates/BlazorWasm.ProjectTemplates/BlazorWasm-CSharp.Server.csproj.in

@@ -2,6 +2,7 @@

  <PropertyGroup>
    <TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
+    <DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>


Follow up on #18841

pranavkm · 2020-02-06T16:47:39Z

@dougbu can you review?

dougbu

Solid

build.ps1

dougbu · 2020-02-07T05:03:53Z

build.ps1

+    $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


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

dougbu · 2020-02-07T05:13:55Z

eng/Version.Details.xml

-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" Pinned="true">
-      <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>82c6ea483d3a17393dad5986df9a8eef89ddcd07</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.2">


This looks fine now. Because we don't have subscriptions from the extensions or efcore repo, Pinned is irrelevant. That is, unless you need to pin something coming from blazor, you could remove all Pinned attributes.

BrennanConroy · 2020-02-07T15:42:42Z

eng/Version.Details.xml

-    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.0-rtm.19572.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
-      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>1c5c7777ea9a19d54ab67ec1521665c99460efc5</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.1.2"  Pinned="true">


You don't have a matching </Dependency> for this one and it's breaking on the internal builds

Purge the blazor-wasm branch

f54902f

Pilchie added the area-blazor Includes: Blazor, Razor Components label Feb 4, 2020

pranavkm force-pushed the prkrishn/purge branch 3 times, most recently from 158ef50 to 0ef6083 Compare February 4, 2020 19:06

Fixup error on SDK restore

af8aa0f

pranavkm force-pushed the prkrishn/purge branch from 0ef6083 to af8aa0f Compare February 4, 2020 19:45

pranavkm marked this pull request as ready for review February 4, 2020 20:28

pranavkm requested review from dougbu, ryanbrandenburg and SteveSandersonMS as code owners February 4, 2020 20:28

pranavkm commented Feb 4, 2020

View reviewed changes

Also Versions.Details.xml

65fb07f

dougbu reviewed Feb 5, 2020

View reviewed changes

ryanbrandenburg approved these changes Feb 5, 2020

View reviewed changes

pranavkm added 9 commits February 5, 2020 10:23

Undo changes to baseline

58fd885

Remove extra sln

96db485

Merge branch 'blazor-wasm' into prkrishn/purge

9450e95

Let's try this

ac15a78

Pin all the things

dd89333

Fixup

6a522be

fixup2

63f28f7

Skip installing dotnet on xplat

2562464

Workaround analyzer

aa2d105

pranavkm force-pushed the prkrishn/purge branch from 8bd9b08 to aa2d105 Compare February 5, 2020 22:56

pranavkm commented Feb 6, 2020

View reviewed changes

pranavkm merged commit 679ed5d into blazor-wasm Feb 7, 2020

pranavkm deleted the prkrishn/purge branch February 7, 2020 03:57

dougbu reviewed Feb 7, 2020

View reviewed changes

BrennanConroy reviewed Feb 7, 2020

View reviewed changes

Purge the blazor-wasm branch #18770

Purge the blazor-wasm branch #18770

Uh oh!

Conversation

pranavkm commented Feb 4, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ryanbrandenburg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pranavkm commented Feb 6, 2020

Uh oh!

dougbu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!