Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update branding to 5.0 #25704

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Update branding to 5.0 #25704

merged 2 commits into from
Jul 16, 2019

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Jul 15, 2019

Update branding in master to 5.0 - please don't merge before noon on 7/16.

Updates the repo's ProductVersion, FileVersion, PackageVersion, and the AssemblyVersion of System.Private.Corelib to 5.0. We still need to figure out what (if anything) needs to be done to guard against overlapping FileVersions on coreclr.dll.

@RussKeldorph PTAL (along with whoever else should be involved)

@wtgodbe wtgodbe requested a review from RussKeldorph July 15, 2019 21:42
<!-- Always use shipping version instead of dummy versions -->
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
<PreReleaseVersionLabel>preview0</PreReleaseVersionLabel>
Copy link
Member Author

Choose a reason for hiding this comment

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

This may change

@wtgodbe wtgodbe added the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label Jul 15, 2019
@wtgodbe
Copy link
Member Author

wtgodbe commented Jul 15, 2019

C:\dotnetbuild\work\7bb9873f-10ea-4723-afbb-9f422bbaa136\Work\da8bde7b-3ac5-45b2-97a6-8888bdde2638\Exec>"C:\dotnetbuild\work\7bb9873f-10ea-4723-afbb-9f422bbaa136\Payload\dotnet.exe" exec --runtimeconfig System.Collections.Concurrent.Tests.runtimeconfig.json xunit.console.dll System.Collections.Concurrent.Tests.dll -xml testResults.xml -nologo -nocolor -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=IgnoreForCI -notrait category=OuterLoop -notrait category=failing @C:\dotnetbuild\work\7bb9873f-10ea-4723-afbb-9f422bbaa136\Payload\CoreFX.issues.rsp
It was not possible to find any compatible framework version
The specified framework 'Microsoft.NETCore.App', version '3.0.0' was not found.

  • The following frameworks were found:
    5.0.0 at [C:\dotnetbuild\work\7bb9873f-10ea-4723-afbb-9f422bbaa136\Payload\shared\Microsoft.NETCore.App]

@wtgodbe
Copy link
Member Author

wtgodbe commented Jul 16, 2019

@RussKeldorph who would be the right person to ask about the CoreFx testing leg? I'm guessing it's hardcoding a netcoreapp3.0 TFM. We put a similar workaround into the core-setup PR to use whatever netcoreapp was built live - https://github.com/dotnet/core-setup/pull/7221/files#diff-c8711222fffc4af4b871fdc4617e8c11R4

@RussKeldorph
Copy link

@BruceForstall Is this going to be fixed when we ingest new assets? Should we just disable these jobs (or let them run red) until that happens?

@BruceForstall
Copy link
Member

The corefx jobs (in coreclr repo) pull a set of corefx tests published by the corefx official build. Looks like they're built with a <test>.runtimeconfig.json with:

"runtimeOptions": {
  "tfm": "netcoreapp3.0",
  "framework": {
    "name": "Microsoft.NETCore.App",
    "version": "3.0.0"
  },

Maybe that forces it?

There is also tests\src\Common\CoreFX\CoreFX.depproj with:

      <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
      <TargetFramework>netcoreapp3.0</TargetFramework>

Does that need to be updated? That file also references published CoreFX packages using versions from Versions.props.

Seems reasonable to let corefx jobs run red until after the first official builds happen with the new branding. (Although perhaps you've already pushed an official build, and there are other issues?)

@wtgodbe
Copy link
Member Author

wtgodbe commented Jul 16, 2019

@BruceForstall we haven't published an official build yet of CoreFx w/ 5.0. We can update that file once we decide what we're doing with the netcoreapp TFM, which is part of https://github.com/dotnet/corefx/issues/39489 (CC @ericstj)

@wtgodbe wtgodbe removed the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label Jul 16, 2019
@wtgodbe
Copy link
Member Author

wtgodbe commented Jul 16, 2019

@wtgodbe wtgodbe merged commit 0cc81b6 into dotnet:master Jul 16, 2019
@wtgodbe wtgodbe deleted the 50 branch July 16, 2019 22:48
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
* Update branding to 5.0

* Update Prerelease to alpha1


Commit migrated from dotnet/coreclr@0cc81b6
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants