Replace Internal.AspNetCore.Sdk with Microsoft.DotNet.Arcade.Sdk #10674

natemcmaster · 2019-05-31T00:19:16Z

This is part of #7280.

Here are the high-level changes:

Change location of dotnet.exe to $repoRoot/dotnet.exe instead of $repoRoot/x64/dotnet.exe
Remove our own implementation of versioning properties and targets
Remove licenseUrl from all nuget packages and use PackageLicenseExpression instead
Remove a bunch of properties and targets from our code that are provided by Microsoft.DotNet.Arcade.Sdk (or are unnecessary now)
Add a handful of workaround to override defaults from Arcade which don't work for this repo

Work remaining to complete #7280 (will be done in a separate PR)

Replace KoreBuild usages in build scripts with Arcade scripts
Update Azure pipelines to use Arcade YAML templates

FYI - marking this as a draft PR until I can get CI to pass. Local builds are working, but still need to validate CI output and tests don't change substantially.

/cc @Pilchie @markwilkie @tmat @aspnet/build

…of $repoRoot/.dotnet/x64

… (follwing arcade conventions)

…nstead of $repoRoot/.dotnet/x64

…ernal.AspNetCore.BuildTasks as a temporary workaround

…tApp

Pilchie

Can't say I know KoreBuild well enough, or reviewed this closely enough to be super confident, but glad to see it happening!

…ng props

natemcmaster · 2019-05-31T04:49:34Z

/azp run

azure-pipelines · 2019-05-31T04:49:38Z

Pull request contains merge conflicts.

natemcmaster · 2019-05-31T04:51:42Z

/azp run

azure-pipelines · 2019-05-31T04:52:09Z

Azure Pipelines successfully started running 3 pipeline(s).

…stProject

…uppress pdb2pdb.exe

analogrelay · 2019-06-06T16:53:51Z

Farewell (almost) KoreBuild, you served us well :).

analogrelay

Mostly in the same boat as @Pilchie, a lot of this is beyond what I was familiar with. But glad to see us get closer in alignment with Arcade :). Good to do this early in preview 7 too so there's some time to shake out the bugs.

analogrelay

Mostly in the same boat as @Pilchie, a lot of this is beyond what I was familiar with. But glad to see us get closer in alignment with Arcade :). Good to do this early in preview 7 too so there's some time to shake out the bugs.

ryanbrandenburg

I didn't spot any problems, but this is a big one with a lot of moving parts, so I feel like the proof will mostly be in if it works or not.

activate.ps1

jkotalik · 2019-06-06T17:39:19Z

build.ps1

@@ -348,6 +348,10 @@ if ($RunBuild -and ($All -or $BuildJava) -and -not $NoBuildJava) {
        }
    }

+    if ($env:PATH -notlike "*${env:JAVA_HOME}*") {


Clarify/comment on what this is for?

It's a minor cleanup that fixes https://github.com/aspnet/AspNetCore-Internal/issues/2592.

jkotalik · 2019-06-06T17:48:59Z

build/AzureIntegration.targets

        RepoRoot=$(AzureIntegrationProjectRoot);
-        VersionSuffix=$(VersionSuffix);
-        BuildNumberSuffix=$(BuildNumberSuffix);


Are these properties still available to the Azure integration projects?

VersionSuffix should be - that's a built in SDK property. BuildNumberSuffix is being removed, but I didn't see it getting used anywhere in Azure integration.

natemcmaster · 2019-06-06T18:54:57Z

I didn't spot any problems, but this is a big one with a lot of moving parts, so I feel like the proof will mostly be in if it works or not.

Agreed. I'm doing a thorough diff of the build outputs to make sure things like nuspecs, manifests, filenames, etc. didn't change unexpectedly.

@ryanbrandenburg - I'm getting consistent test failures on non-Windows platforms in the templates. I couldn't figure out how my changes would cause this failure. Are test failures here a known issue?
https://dev.azure.com/dnceng/public/_build/results?buildId=214984&view=ms.vss-test-web.build-test-results-tab&runId=5269634&resultId=110652&paneView=debug

natemcmaster · 2019-06-06T19:17:28Z

Blocked on dotnet/arcade#2984 - haven't found a workaround. Struggling to figure out to make our .wixproj files work without some nasty hacks. Evaluation order for VersionSuffix moved from Directory.Build.props to Microsoft.Common.targets, which makes it hard to use $(PackageVersion) in the output file name for a Windows installer.

ryanbrandenburg · 2019-06-06T20:40:11Z

@natemcmaster The templating link failures should be fixed by #10957 if you rebase on to latest.

natemcmaster · 2019-06-07T01:32:56Z

Thanks Ryan! I'll update and try again

…perty

natemcmaster · 2019-06-07T19:55:54Z

I think I found a workaround for dotnet/arcade#2984 and have pushed a fix to the .wixproj files.

natemcmaster · 2019-06-07T23:10:30Z

@aspnet-hello triage https://dev.azure.com/dnceng/public/_build/results?buildId=216603

aspnet-hello · 2019-06-07T23:12:18Z

This comment was made automatically. If there is a problem contact [email protected].

I've triaged the above build. I've created/commented on the following issue(s)
https://github.com/aspnet/AspNetCore-Internal/issues/2646

natemcmaster · 2019-06-08T00:18:15Z

This is a big PR. I've carefully looked over the build outputs and don't see any major unexpected changes. Merging now so we can move forward with the next round of Arcade improvements.

natemcmaster added 17 commits May 30, 2019 13:11

Update build.cmd to install .NET Core into $repoRoot/.dotnet instead …

6e733eb

…of $repoRoot/.dotnet/x64

Move restore sources from build/sources.props into eng/Versions.props…

21e6e53

… (follwing arcade conventions)

Remove usages of RuntimeFrameworkVersion in tests and build

dd0837e

Update Blazor VSIX to use Arcade VSIX tools

4d8826b

Rename Common.Tests to IIS.Common.TestLib and make it a test asset

daba69b

Remove custom versions props for ANCM installer code

8f0e9f9

fixup! Update build.cmd to install .NET Core into $repoRoot/.dotnet i…

f523e22

…nstead of $repoRoot/.dotnet/x64

Remove duplicate references to xunit and remove usages of IsTestProject

32f98b0

Remove duplicate references to Internal.AspNetCore.Analyzers

d0ac2b5

Import Arcade.Sdk props and targets and remove custom versioning props

ac47d18

Remove references to Internal.AspNetCore.Sdk

4d6ecd0

Rename PackageLicenseType => PackageLicenseExpression

5ba9bb4

Remove dependency on tasks in Internal.AspNetCore.Sdk, add ref to Int…

c6ef04c

…ernal.AspNetCore.BuildTasks as a temporary workaround

Use Arcade's nuspec support

dac5076

Reset DebugType

a5ddd7a

Rename SignalR.Client.FunctionalTests to SignalR.Client.FunctionalTes…

2630f62

…tApp

Add more workarounds for issues with Arcade

7eca3f3

Pilchie approved these changes May 31, 2019

View reviewed changes

natemcmaster added 4 commits May 30, 2019 20:02

fixup! Update Blazor VSIX to use Arcade VSIX tools

9565f1a

fixup! Use Arcade's nuspec support

586086c

fixup! Use Arcade's nuspec support

ccd642d

fixup! Import Arcade.Sdk props and targets and remove custom versioni…

d478f0c

…ng props

Merge branch 'master' into namc/arcade

d092e03

natemcmaster added 3 commits May 30, 2019 22:14

fixup! Remove duplicate references to xunit and remove usages of IsTe…

48a673d

…stProject

Don't use PackageVersion for debproj - it messes up dotnet restore

58a57fe

Override Arcade's default version of Microsoft.VSSDK.BuildTools and s…

7646aae

…uppress pdb2pdb.exe

natemcmaster requested review from Tratcher and a team as code owners June 6, 2019 06:20

analogrelay approved these changes Jun 6, 2019

View reviewed changes

ryanbrandenburg approved these changes Jun 6, 2019

View reviewed changes

jkotalik reviewed Jun 6, 2019

View reviewed changes

activate.ps1 Show resolved Hide resolved

jkotalik reviewed Jun 6, 2019

View reviewed changes

Fix wix installer

4f1371a

natemcmaster added the blocked The work on this issue is blocked due to some dependency label Jun 6, 2019

This was referenced Jun 6, 2019

Support importing Version.props directly dotnet/arcade#2985

Closed

How to set project properties that depend on PackageVersion? dotnet/arcade#2984

Closed

Workaround the changes to evaluation order for the PackageVersion pro…

780f27e

…perty

natemcmaster removed the blocked The work on this issue is blocked due to some dependency label Jun 7, 2019

natemcmaster added 2 commits June 7, 2019 16:56

workaround aspnet/AspNetCore#11009

cdef6fd

Fix package ID for blazor

03ac5a5

natemcmaster merged commit 41ce223 into master Jun 8, 2019

ghost deleted the namc/arcade branch June 8, 2019 00:19

natemcmaster mentioned this pull request Jun 10, 2019

Generating resx files is broken #11054

Closed

analogrelay added this to the 3.0.0-preview7 milestone Jun 10, 2019

natemcmaster mentioned this pull request Jun 11, 2019

Set official build ID #11077

Merged

Replace Internal.AspNetCore.Sdk with Microsoft.DotNet.Arcade.Sdk #10674

Replace Internal.AspNetCore.Sdk with Microsoft.DotNet.Arcade.Sdk #10674

Uh oh!

Conversation

natemcmaster commented May 31, 2019

Uh oh!

Pilchie left a comment

Choose a reason for hiding this comment

Uh oh!

natemcmaster commented May 31, 2019

Uh oh!

azure-pipelines bot commented May 31, 2019

Uh oh!

natemcmaster commented May 31, 2019

Uh oh!

azure-pipelines bot commented May 31, 2019

Uh oh!

analogrelay commented Jun 6, 2019

Uh oh!

analogrelay left a comment

Choose a reason for hiding this comment

Uh oh!

analogrelay left a comment

Choose a reason for hiding this comment

Uh oh!

ryanbrandenburg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jkotalik Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

natemcmaster Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

jkotalik Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

natemcmaster Jun 6, 2019

Choose a reason for hiding this comment

Uh oh!

natemcmaster commented Jun 6, 2019

Uh oh!

natemcmaster commented Jun 6, 2019

Uh oh!

ryanbrandenburg commented Jun 6, 2019

Uh oh!

natemcmaster commented Jun 7, 2019

Uh oh!

natemcmaster commented Jun 7, 2019

Uh oh!

natemcmaster commented Jun 7, 2019

Uh oh!

aspnet-hello commented Jun 7, 2019

Uh oh!

natemcmaster commented Jun 8, 2019

Uh oh!

Uh oh!