Skip to content
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

Jump to bottom

update product version to 6.0.0 #40950

Merged
merged 2 commits into from
Aug 20, 2020
Merged

update product version to 6.0.0 #40950

merged 2 commits into from
Aug 20, 2020

Conversation

Anipik
Copy link
Contributor

@Anipik Anipik commented Aug 17, 2020 •
edited
Loading

  • update the package versions
  • update the assembly and product verision
  • fix the package baseline file using the repoupdatePackageBaseline target
  • fix the paths.

@Anipik Anipik requested review from ericstj and safern August 17, 2020 20:01
@Anipik Anipik requested a review from marek-safar as a code owner August 17, 2020 20:01
@ghost
Copy link

ghost commented Aug 17, 2020

Tagging subscribers to this area: @safern, @ViktorHofer
See info in area-owners.md if you want to be subscribed.

@ericstj
Copy link
Member

ericstj commented Aug 17, 2020

Can you double check every project that

  1. Has a pkgproj
  2. Has a $(NetCoreAppCurrent) target framework
  3. Does not set ExcludeCurrentNetCoreAppFromPackage = true

And add a net5.0(-*) TargetFramework as appropriate?

ericstj
ericstj reviewed Aug 17, 2020
View reviewed changes
...braries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il Outdated
@@ -12,8 +12,8 @@
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 )

.custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0..
.custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0..
.custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...6.0.0.0..
Copy link
Member

Choose a reason for hiding this comment

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

I thought we had plumbed the correct data for this through the header?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we missed the hex strings

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i will hardcode for this pr and fix after the snap

Copy link
Member

Choose a reason for hiding this comment

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

See #40895 we may want to fix for 5.0

@ericstj
Copy link
Member

ericstj commented Aug 18, 2020 •
edited
Loading

And add a net5.0(-*) TargetFramework as appropriate?

Per offline conversation, this doesn't need to be done with the version change, but does need to happen when the TFM changes. The TFM change can be separate as it likely requires a bit more to make the SDK work with the new TFM. (EG: temporary KnownFrameworkReference)

ericstj
ericstj approved these changes Aug 18, 2020
View reviewed changes
src/libraries/pkg/baseline/packageIndex.json
@@ -171,7 +173,8 @@
],
Copy link
Member

Choose a reason for hiding this comment

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

Technically we should be setting baselineVersion for all packages. However it's likely less important here since we don't ever use PackageReferences to the Microsoft.Extensions packages and none of their versions are frozen (so all assembly refs will be to 6.0.0.0 and thus get the 6.0.0-* packages).

ericstj
ericstj reviewed Aug 18, 2020
View reviewed changes
eng/targetingpacks.targets Outdated
@@ -2,7 +2,7 @@
<PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">
<_UseLocalTargetingRuntimePack>true</_UseLocalTargetingRuntimePack>
<UseLocalTargetingRuntimePack Condition="'$(UseLocalTargetingRuntimePack)' == ''">true</UseLocalTargetingRuntimePack>
<EnableTargetingPackDownload>false</EnableTargetingPackDownload>
Copy link
Member

Choose a reason for hiding this comment

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

I think we still want to download the targeting pack if UseLocalTargetingRuntimePack=false. It's possible that the SDK doesn't carry it (once it moves to net6.0 for example).

...aries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj Outdated Show resolved Hide resolved
...aries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj Outdated
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<SkipTestsOnPlatform Condition="'$(TargetsMobile)' == 'true' or '$(TargetOS)' == 'FreeBSD' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'armel' or '$(TargetArchitecture)' == 'wasm'">true</SkipTestsOnPlatform>
<UseLocalTargetingRuntimePack>false</UseLocalTargetingRuntimePack>
Copy link
Member

Choose a reason for hiding this comment

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

This deserves a comment. Let's mention that this test assembly needs to run on the tool shared framework so it should reference the latest references. We build against tool shared framework's ref pack, run the generator on the tool shared framework, then execute the test on the test shared framework.

ericstj
ericstj reviewed Aug 19, 2020
View reviewed changes
eng/packaging.props
@@ -20,7 +20,7 @@
<SkipBaseLineCheck>true</SkipBaseLineCheck>

<!-- by default all packages will use the same version which revs with respect to product version -->
<PackageVersion Condition="'$(PackageVersion)' == ''">5.0.0</PackageVersion>
<PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

Not for this PR, but we should try to make this use $(ProductVersion) if possible.

@Anipik Anipik merged commit d9f0ba7 into dotnet:master Aug 20, 2020
@Anipik Anipik deleted the net6 branch August 20, 2020 00:23
This was referenced Aug 20, 2020
Merged
Merged
@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mmitche mmitche mmitche left review comments

@ViktorHofer ViktorHofer ViktorHofer left review comments

@akoeplinger akoeplinger akoeplinger left review comments

@ericstj ericstj ericstj approved these changes

@safern safern Awaiting requested review from safern

@marek-safar marek-safar Awaiting requested review from marek-safar

@jozkee jozkee Awaiting requested review from jozkee

@layomia layomia Awaiting requested review from layomia

@steveharter steveharter Awaiting requested review from steveharter

Assignees
No one assigned
Labels
area-Infrastructure-libraries
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Anipik @ericstj @akoeplinger @ViktorHofer @mmitche @safern @Dotnet-GitSync-Bot