runtime: remove netcoreapp2.x targets by tmds · Pull Request #1890 · dotnet/source-build

tmds · 2020-11-16T19:26:42Z

Contributes to removing Microsoft.NETCore.DotNetHost* 2.x prebuilts.

tmds · 2020-11-16T20:25:50Z

The patch doesn't apply:

EXEC : error : patch failed: eng/empty.csproj:9 [/src/repos/runtime.proj]
EXEC : error : eng/empty.csproj: patch does not apply [/src/repos/runtime.proj]

dagood · 2020-11-16T22:47:11Z

I want to bring up a prioritization issue--there's a reasonable variety of of repos using these (from a recent local build):

Microsoft.NETCore.DotNetAppHost/2.0.0

src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.Build.Tasks.Installers/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.SignTool/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/Microsoft.Win32.SystemEvents/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.ComponentModel.Composition/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Data.Odbc/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Diagnostics.EventLog/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Diagnostics.PerformanceCounter/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.DirectoryServices.AccountManagement/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.DirectoryServices.Protocols/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.DirectoryServices/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Management/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Runtime.CompilerServices.Unsafe/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Security.AccessControl/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Security.Principal.Windows/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Text.Encoding.CodePages/project.assets.json
src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/artifacts/obj/XliffTasks/project.assets.json

Microsoft.NETCore.DotNetAppHost/2.1.0

src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/artifacts/NuGet.Build.Tasks.Console/16.0/obj/project.assets.json
src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/artifacts/NuGet.CommandLine.XPlat/16.0/obj/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.Arcade.Sdk/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.Build.Tasks.Packaging/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.CMake.Sdk/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.GenFacades/project.assets.json
src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.SourceBuild.Tasks/project.assets.json
src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/artifacts/obj/Microsoft.Diagnostics.NETCore.Client/project.assets.json
src/msbuild.126527ff107ae93fed10af675506c56d046aa5a3/artifacts/obj/Localization/project.assets.json
src/msbuild.126527ff107ae93fed10af675506c56d046aa5a3/artifacts/obj/MSBuild/project.assets.json
src/msbuild.126527ff107ae93fed10af675506c56d046aa5a3/artifacts/obj/Microsoft.Build/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Net.WebSockets.WebSocketProtocol/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Security.Principal.Windows/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.ServiceModel.Syndication/ref/project.assets.json
src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/empty/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.Build.Tasks.Git/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.SourceLink.AzureDevOpsServer.Git/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.SourceLink.AzureRepos.Git/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.SourceLink.Bitbucket.Git/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.SourceLink.Common/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.SourceLink.GitHub/project.assets.json
src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/obj/Microsoft.SourceLink.GitLab/project.assets.json
src/templating.31980633108a1bef00c798136fcd30a873c90fa3/artifacts/obj/Microsoft.TemplateSearch.TemplateDiscovery/project.assets.json
src/templating.31980633108a1bef00c798136fcd30a873c90fa3/artifacts/obj/dotnet-new3/project.assets.json

(I think the other ones are fairly similar.)

There could also potentially be more usages that don't show up properly in project.assets.json files. (#1811, #1881 (comment).) I'm also not confident that TFM changes will work all the way through the stack without significant more work as we go through each one. The uncertainty here makes me uneasy about relying on spot fixes to get us all the way to 5.0.0 GA.

I think it will take significantly less time to use SBRP to fill these in. Since there aren't any runtime.*.Microsoft.NETCore.* prebuilts, these packages should be text-only. There's little risk of surprise usages showing up because we're actually providing the nupkg requested.

However... it looks like we're basically run out of non-SBRP things to work on (other than Humanizer, and I'm waiting on a build to complete in a couple hours to update the table again). So I don't think it's bad to go for the good TFM fixes at the same time as the SBRP fix, but I want to let you know where I think we're at and why I think we should plan to add these into SBRP even though you're also working on this side of a fix.

dseefeld · 2020-11-16T22:53:48Z

However... it looks like we're basically run out of non-SBRP things to work on...

Although, there's no special tooling required to add a text-only prebuilt to SBRP. Just grab the expanded restored package and add it to SBRP under src/textOnlyPackages, copy an existing textOnlyPackage .csproj and modify it to match the pattern.

tmds · 2020-11-17T07:58:47Z

I've added two more patches which should eliminate Microsoft.NETCore.DotNet*/2.0.0 all together.
I've included the patch from #1828 also.

We can have a look at the prebuilt report once CI is done and then see if we want to finish this PR or use SBRPs instead.

tmds · 2020-11-17T12:57:09Z

My patch that changed arcade to target net5.0 instead of netcoreapp2.1 is having fall-out.
arcade repos have this tfm hard-coded in their eng/common/tools.sh:

  _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
  _InitializeBuildToolCommand="msbuild"
  _InitializeBuildToolFramework="netcoreapp2.1"

tmds · 2020-11-17T13:02:58Z

I removed changes that involved netcoreapp2.1.

dagood · 2020-11-17T16:16:25Z

This PR is also now addressing these prebuilts:

System.Security.Cryptography.Cng,5.0.0-preview.3.20214.6
System.Security.Cryptography.Pkcs,5.0.0-preview.3.20214.6

Since they're 5.0-preview.3 versioned and not text only, it's not quite as nice if we stuck them in SBRP (vs. Microsoft.NETCore.DotNetHost) so I guess it will be necessary to get these TFM changes through.

patches/arcade/0015-remove-netcoreapp2.0-targets.patch

dagood · 2020-11-17T17:41:40Z

My patch that changed arcade to target net5.0 instead of netcoreapp2.1 is having fall-out.
arcade repos have this tfm hard-coded in their eng/common/tools.sh:
  _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
  _InitializeBuildToolCommand="msbuild"
  _InitializeBuildToolFramework="netcoreapp2.1"

Missed what this was connected to earlier--I think adding a target to repos/Directory.Build.targets along the lines of UpdateGlobalJsonVersions to replace this line would be a reasonable way to go to avoid a bunch of outdateable patches. I think using the ReplaceTextInFile build task would work? (Needs a UsingTask probably--I don't think it's currently used anywhere.)

tmds · 2020-11-17T20:01:07Z

UpdateGlobalJsonVersions to replace this line would be a reasonable way to go to avoid a bunch of outdateable patches. I think using the ReplaceTextInFile build task would work? (Needs a UsingTask probably--I don't think it's currently used anywhere.

I pushed a commit for this, ptal.

Now I hit a new issue:

MSBUILD : error MSB1021: Cannot create an instance of the logger. The given assembly name or codebase was invalid. (0x80131047)
Switch: /home/tmds/repos/source-build/packages/restored/microsoft.dotnet.arcade.sdk/5.0.0-beta.20426.4/tools/net5.0/Microsoft.DotNet.Arcade.Sdk.dll

I think this is because the prebuilt microsoft.dotnet.arcade.sdk doesn't have the tools/net5.0 yet.

dagood

Functionally looks fine (other than comment you noted)--comments on position and style.

tools-local/init-build.proj

repos/Directory.Build.targets

dagood · 2020-11-17T20:28:55Z

I think this is because the prebuilt microsoft.dotnet.arcade.sdk doesn't have the tools/net5.0 yet.

Yeah, this makes sense... I suppose the replacement target needs to be conditioned on whether the repo proj does this or similar (and it applies)... there's some logic to this I don't quite have in my head at the moment:

    <UseSourceBuiltSdkOverride Include="@(ArcadeBootstrapSdkOverride)" />

tmds · 2020-11-18T11:09:18Z

Production fails at Build source-build with:

/src/repos/Directory.Build.targets(566,5): error : 2 new packages used not in baseline! See report at /src/artifacts/prebuilt-report/baseline-comparison.xml for more information. Package IDs are: [/src/repos/known-good.proj]
/src/repos/Directory.Build.targets(566,5): error : Microsoft.VisualStudio.Setup.Configuration.Interop.1.16.30 [/src/repos/known-good.proj]
/src/repos/Directory.Build.targets(566,5): error : System.Threading.Tasks.Dataflow.4.5.24 [/src/repos/known-good.proj]
  7 packages in baseline weren't used!

Online/Offline fail at Build tarball with:

RepoBuild:
  /tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/build.sh  --pack --configuration Release --binaryLog --ci --warnAsError false  /p:DotNetPackageVersionPropsPath=/tb/tarball_890529/artifacts/obj/x64/Release/PackageVersions.props /p:DotNetRestoreSourcePropsPath=/tb/tarball_890529/artifacts/obj/x64/Release/RestoreSources.props /p:DotNetBuildOffline=true >> /tb/tarball_890529/artifacts/logs/sourcelink.log 2>&1
/tb/tarball_890529/repos/Directory.Build.targets(301,5): error MSB3073: The command "/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/build.sh  --pack --configuration Release --binaryLog --ci --warnAsError false  /p:DotNetPackageVersionPropsPath=/tb/tarball_890529/artifacts/obj/x64/Release/PackageVersions.props /p:DotNetRestoreSourcePropsPath=/tb/tarball_890529/artifacts/obj/x64/Release/RestoreSources.props /p:DotNetBuildOffline=true >> /tb/tarball_890529/artifacts/logs/sourcelink.log 2>&1" exited with code 1. [/tb/tarball_890529/repos/sourcelink.proj]
ReportRepoError:
##[debug]Processed:   ##vso[task.setvariable variable=Artifacts;isSecret=false;isOutput=true]/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts
##[debug]Processed:   ##vso[task.setvariable variable=Artifacts.Toolset;isSecret=false;isOutput=true]/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/toolset
##[debug]Processed:   ##vso[task.setvariable variable=Artifacts.Log;isSecret=false;isOutput=true]/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/log/Release
##[debug]Processed:   ##vso[task.setvariable variable=Temp;isSecret=false;isOutput=true]/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/tmp/Release
##[debug]Processed:   ##vso[task.setvariable variable=TMP;isSecret=false;isOutput=true]/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/tmp/Release
  
  Welcome to .NET 5.0!
  ---------------------
  SDK Version: 5.0.100-rc.1.20452.10
  
  ----------------
  Installed an ASP.NET Core HTTPS development certificate.
  To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
  Learn about HTTPS: https://aka.ms/dotnet-https
  ----------------
  Write your first app: https://aka.ms/dotnet-hello-world
  Find out what's new: https://aka.ms/dotnet-whats-new
  Explore documentation: https://aka.ms/dotnet-docs
  Report issues and find source on GitHub: https://github.com/dotnet/core
  Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli
  --------------------------------------------------------------------------------------
  /tb/tarball_890529/.dotnet/sdk/5.0.100-rc.1.20452.10/MSBuild.dll /nologo -maxcpucount /m -verbosity:m /v:minimal /bl:/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/log/Release/ToolsetRestore.binlog /clp:Summary /clp:ErrorsOnly;NoSummary /nr:false /p:TreatWarningsAsErrors=false /p:ContinuousIntegrationBuild=true /p:__ToolsetLocationOutputFile=/tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/toolset/5.0.0-beta.19575.7.txt /t:__WriteToolsetLocation /tb/tarball_890529/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/artifacts/toolset/restore.proj
  Clearing NuGet HTTP cache: /root/.local/share/NuGet/v3-cache
  Local resources cleared.
##[debug]Processed:   ##vso[task.setvariable variable=NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS;isSecret=false;isOutput=true]20
##[debug]Processed:   ##vso[task.setvariable variable=NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS;isSecret=false;isOutput=true]20
  MSBUILD : error MSB1021: Cannot create an instance of the logger. The given assembly name or codebase was invalid. (0x80131047)
  Switch: /tb/tarball_890529/packages/restored/ArcadeBootstrapPackage/microsoft.dotnet.arcade.sdk/5.0.0-beta.20431.1/tools/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll
##[error](NETCORE_ENGINEERING_TELEMETRY=Build) Build failed (exit code '1').

tmds · 2020-11-19T07:22:29Z

I continue to get bitten by the viral nature of the tfm change ...

  /tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj : error NU1202: Package NuGet.Packaging 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Packaging 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0) [/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/Arcade.sln]
##[error]/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj(0,0): error NU1202: (NETCORE_ENGINEERING_TELEMETRY=Restore) Package NuGet.Packaging 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Packaging 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0)
##[debug]Processed:   ##vso[task.logissue type=error;sourcepath=/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj;linenumber=0;columnnumber=0;code=NU1202;](NETCORE_ENGINEERING_TELEMETRY=Restore) Package NuGet.Packaging 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Packaging 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0)
  /tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj : error NU1202: Package NuGet.ProjectModel 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.ProjectModel 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0) [/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/Arcade.sln]
##[error]/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj(0,0): error NU1202: (NETCORE_ENGINEERING_TELEMETRY=Restore) Package NuGet.ProjectModel 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.ProjectModel 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0)
##[debug]Processed:   ##vso[task.logissue type=error;sourcepath=/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj;linenumber=0;columnnumber=0;code=NU1202;](NETCORE_ENGINEERING_TELEMETRY=Restore) Package NuGet.ProjectModel 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.ProjectModel 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0)
  /tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj : error NU1202: Package NuGet.Versioning 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Versioning 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0) [/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/Arcade.sln]
##[error]/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj(0,0): error NU1202: (NETCORE_ENGINEERING_TELEMETRY=Restore) Package NuGet.Versioning 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Versioning 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0)
##[debug]Processed:   ##vso[task.logissue type=error;sourcepath=/tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj;linenumber=0;columnnumber=0;code=NU1202;](NETCORE_ENGINEERING_TELEMETRY=Restore) Package NuGet.Versioning 5.8.0-rc.6930 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Versioning 5.8.0-rc.6930 supports: net5.0 (.NETCoreApp,Version=v5.0)
    Failed to restore /tb/tarball_891178/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj (in 7.55 sec).

tmds · 2020-11-19T07:26:40Z

Oh, no, ... it's due to me removing 0013-Don-t-build-SourceBuild.Tasks-for-net472.patch ...

tmds · 2020-11-19T15:47:32Z

CI is looking good. @dagood, I have also addressed your feedback about the tools.sh substitution

patches/xliff-tasks/0002-remove-netcoreapp2.0-targets.patch

dagood · 2020-11-19T17:49:34Z

Filed #1900 for the weird roslyn-analyzers error in one leg and pressed retry. I'd seen it before locally but assumed it was my fault at the time.

…ence

tmds · 2020-11-20T13:32:50Z

CI is happy. I hope this means we are close to merging this.

This is the remaining 2.0.0 host usage, xliff is no longer here:

<AnnotatedUsage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" File="packages/restored/nunit3.dotnetnew.template/1.5.3/Content/dotnet-new-nunit-fsharp/obj/project.assets.json" Project="" SourceBuildPackageIdCreator="runtime MicrosoftNETCoreDotNetAppHostPackageVersion/5.0.0"/>
<AnnotatedUsage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" File="src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/artifacts/obj/Microsoft.DotNet.SignTool/project.assets.json" Project="src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/" SourceBuildPackageIdCreator="runtime MicrosoftNETCoreDotNetAppHostPackageVersion/5.0.0"/>
<AnnotatedUsage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" File="src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.Data.Odbc/project.assets.json" Project="src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/" SourceBuildPackageIdCreator="runtime MicrosoftNETCoreDotNetAppHostPackageVersion/5.0.0"/>
<AnnotatedUsage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" File="src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/artifacts/obj/System.DirectoryServices.Protocols/project.assets.json" Project="src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/" SourceBuildPackageIdCreator="runtime MicrosoftNETCoreDotNetAppHostPackageVersion/5.0.0"/>

I can look at updating these projects in a new PR so we don't need a 2.0.0 sbrp.
The first one has a weird location: packages/restored/nunit3.dotnetnew.template.

dagood · 2020-11-20T15:57:31Z

The first one has a weird location: packages/restored/nunit3.dotnetnew.template.

This is probably just a side effect of how it works, not actually usage. The prebuilt tooling looks for nupkgs that exist in the package cache first, then finds all project.assets.json files that have the package ID in it. Looks like this package for some reason contains intermediate outputs of some kind.

I can look at updating these projects in a new PR so we don't need a 2.0.0 sbrp.

IMO we should just put these in SBRP. We can do it both ways in parallel, but crafting patches is riskier from a schedule perspective. (The real big prebuilt win with this PR is System.Security.Cryptography.Cng/Pkcs 5.0.0-preview.3.20214.6 with that point of view, since that wouldn't be as nice to put into SBRP.)

tmds · 2020-11-23T04:36:17Z

@dagood thanks you for helping me get past some bumps.

runtime: remove netcoreapp2.x targets

35054d6

Remove other patch touching empty.csproj

c54605a

tmds added 3 commits November 17, 2020 08:50

xliff-tasks: remove netcoreapp2.0 targets

d2a71b7

arcade: remove netcoreapp2.x targets

cdcedf5

nuget.client: build for .NET 5

e236bf3

tmds added 2 commits November 17, 2020 10:47

arcade: remove conflicting patch

4fc8bc8

Fix ArcadeSdkBuildTasksAssembly location

2f68362

tmds force-pushed the runtime_2x branch from cfd8a34 to eb827da Compare November 17, 2020 13:02

dagood mentioned this pull request Nov 17, 2020

nuget.client: build for .NET 5 #1828

Closed

dagood reviewed Nov 17, 2020

View reviewed changes

patches/arcade/0015-remove-netcoreapp2.0-targets.patch Outdated Show resolved Hide resolved

tmds force-pushed the runtime_2x branch from eb827da to 2f68362 Compare November 17, 2020 19:10

Update BuildToolFramework to net5.0

7a4fed1

dagood reviewed Nov 17, 2020

View reviewed changes

tools-local/init-build.proj Outdated Show resolved Hide resolved

repos/Directory.Build.targets Outdated Show resolved Hide resolved

repos/Directory.Build.targets Outdated Show resolved Hide resolved

tmds added 2 commits November 18, 2020 09:27

Only update tools.sh when UseBootstrapArcade

1809eb4

runtime: libraries-packages: use net5.0 PackagingTaskAssembly

6083bc4

Make tools.sh patch work regardless netcoreapp2.1 or net5.0

8c0b026

tmds force-pushed the runtime_2x branch from c033b76 to 8c0b026 Compare November 18, 2020 14:48

tmds added 2 commits November 18, 2020 15:54

Fix regex for net5.0

47ed0e7

Patch all the things!

d7409ec

Build Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk for net5.0

faef1a2

tmds added 2 commits November 19, 2020 08:26

Compensate for removing patch

037038e

PR feedback

9713ca0

tmds commented Nov 19, 2020

View reviewed changes

patches/xliff-tasks/0002-remove-netcoreapp2.0-targets.patch Show resolved Hide resolved

tmds added 2 commits November 19, 2020 20:07

xliff-tasks: remove explicit Microsoft.NETCore.App 2.0.0 PackageRefer…

f379d26

…ence

XliffTasks: don't DisableImplicitFrameworkReferences

0cd9980

dagood approved these changes Nov 20, 2020

View reviewed changes

dagood merged commit be5787e into dotnet:master Nov 20, 2020

Conversation

tmds commented Nov 16, 2020

Uh oh!

tmds commented Nov 16, 2020

Uh oh!

dagood commented Nov 16, 2020

Uh oh!

dseefeld commented Nov 16, 2020

Uh oh!

tmds commented Nov 17, 2020

Uh oh!

tmds commented Nov 17, 2020

Uh oh!

tmds commented Nov 17, 2020

Uh oh!

dagood commented Nov 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

dagood commented Nov 17, 2020

Uh oh!

tmds commented Nov 17, 2020

Uh oh!

dagood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dagood commented Nov 17, 2020

Uh oh!

tmds commented Nov 18, 2020

Uh oh!

tmds commented Nov 19, 2020

Uh oh!

tmds commented Nov 19, 2020

Uh oh!

tmds commented Nov 19, 2020

Uh oh!

Uh oh!

dagood commented Nov 19, 2020

Uh oh!

tmds commented Nov 20, 2020

Uh oh!

dagood commented Nov 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tmds commented Nov 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dagood commented Nov 17, 2020 •

edited

Loading

dagood commented Nov 20, 2020 •

edited

Loading