Add missed packages to packages.builds for 2.1.5 by wtgodbe · Pull Request #32203 · dotnet/corefx

wtgodbe · 2018-09-10T21:14:57Z

I went through all changes to corefx\src in release/2.1 since 2.1.0, and I believe that these are all of the packages that should have been shipped for servicing, but weren't.

System.IO.Pipelines - 141c2f4#diff-25d902c24283ab8cfbac54dfa101ad31
System.Security.Cryptography.Pkcs - 767d4aa#diff-25d902c24283ab8cfbac54dfa101ad31 (among others)
System.Net.WebSockets.WebSocketProtocol - c6f4eb6#diff-25d902c24283ab8cfbac54dfa101ad31 (note that we did ship this package as part of 2.1.2, but it was removed from packages.builds before we could ship the changes from the linked PR. See 8dabbd8#diff-25d902c24283ab8cfbac54dfa101ad31)
System.Security.Principal.Windows - 6ac8b2a#diff-25d902c24283ab8cfbac54dfa101ad31
System.Net.Http.WinHttpHandler - be49d38#diff-25d902c24283ab8cfbac54dfa101ad31
System.Diagnostics.DiagnosticSource - 35a009a#diff-25d902c24283ab8cfbac54dfa101ad31
System.Runtime.CompilerServices.Unsafe - 5b16645#diff-25d902c24283ab8cfbac54dfa101ad31 (was also shipped as part of 2.1.2, but then had subsequent changes made that didn't get shipped)

@weshaggard @safern PTAL

CC @danmosemsft

[edit] Here's the list of the original 2.1 fix PR's

Fix ReadAsync not returning when cancellation token fires during FlushAsync [2.1] Fix ReadAsync not returning when cancellation token fires during FlushAsync #31871
Fix compatibility issues vs NetFX in SignedCms and EnvelopedCms [release/2.1]: Fix compatibility issues vs NetFX in SignedCms and EnvelopedCms #30432
Fix WebSocket server split header parsing with large payload [release/2.1] Fix WebSocket server split header parsing with large payload (#30402) #30407
Duplicate the access token passed to WindowsIdentity.RunImpersonated [release/2.1] Duplicate the access token passed to WindowsIdentity.RunImpersonated (#30346) #30379
Fix WinHttpHandler when using authenticating proxies [release/2.1] Fix WinHttpHandler when using authenticating proxies #30212
Add support and tests for HTTP 308 Permanent Redirect [release/2.1] Add support and tests for HTTP 308 Permanent Redirect (#30398) #30954
Adding special target that will get a resource file and pass it to ilasm for S.R.CS.Unsafe so that it has the right version headers Adding special target that will get a resource file and pass it to ilasm for S.R.CS.Unsafe so that it has the right version headers #31806

There are likely other issues that would not be shipped without this PR. The above is just the first change in the library. Eg., #31680

weshaggard · 2018-09-10T21:20:13Z

src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>


Lets keep these in dir.props/directory.build.props file for consistency and to match your doc.

Sure. I have both locations called out in the doc, but I'm fine with aiming to move them into dir.props just for consistency.

weshaggard · 2018-09-10T21:23:53Z

src/System.Security.Cryptography.Pkcs/dir.props

  <Import Project="..\dir.props" />
  <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
+    <AssemblyVersion>4.0.3.1</AssemblyVersion>


Conflicts with #32111. @bartonjs I know I told you to bump it to 4.0.4.0 in your PR but after further consideration I think we should only bump the revision to avoid needing to keep bumping master as well. So what we have here should be the right version bump.

Presumably we should just close #32111 and take this as the "fix everything" change?

I suspect so.

@weshaggard do I also need to update packageIndex.json with the new AssemblyVersions, like https://github.com/dotnet/corefx/pull/32111/files#diff-122916076db7087dbc454352fada61eeR4293? If so I should update the doc as well.

I suspect you might. You will hopefully figure out when the all configuration leg fails.

weshaggard · 2018-09-10T21:36:45Z

src/System.IO.Pipelines/dir.props

  <Import Project="..\dir.props" />
  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <AssemblyVersion>4.0.0.1</AssemblyVersion>


@natemcmaster FYI we are bumping the assembly version of System.IO.Pipelines for 2.1.5 servicing.

weshaggard

LGTM - Please do a local package build to make sure the package versions build and look correct.

…ot clash with master

safern · 2018-09-11T17:17:14Z

Will per: #32108 (comment) I added commit 4e4dc12 to fix the System.Drawing.Common assembly version.

jamshedd · 2018-09-11T18:13:10Z

Approved for 2.1.5.

ViktorHofer · 2018-09-11T19:41:43Z

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

      "InboxOn": {},
      "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.5.0"
+        "4.0.0.0": "4.5.1",


The assembly version's package version should be the one in which the assembly with the given version shipped the first time. In this case 4.5.0 and not 4.5.1. Same for others below/above.

No it should be the latest package that shipped stable. We want to ensure that folks are getting the latest version of any changes with the same assembly version.

hmm makes sense but @ericstj told me the opposite in a random PR which I can't find right now.

weshaggard · 2018-09-11T20:20:02Z

The tests are failing because we didn't update the assembly version for the il project. We need to also bump the version in the .il file for this particular project

corefx/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il

Line 40 in 0e84b39

.ver 4:0:4:0

wtgodbe · 2018-09-11T20:23:52Z

@weshaggard updated

wtgodbe · 2018-09-11T21:25:29Z

@ericstj do you recognize the failures here?

Tools\Packaging.targets(1131,5): error : System.Security.Principal.Windows should support API version 4.1.1.1 on Xamarin.WatchOS,Version=v1.0 but D:\j\workspace\windows-TGrou---27e62afc\bin\ref\System.Security.Principal.Windows\4.1.1.0\netstandard\System.Security.Principal.Windows.dll was found to support 4.1.1.0.

It looks like we get the same error for a variety of platforms. Do I need to modify the InboxOn section?

corefx/pkg/Microsoft.Private.PackageBaseline/packageIndex.json

Line 4449 in 0173b41

"InboxOn": {

weshaggard · 2018-09-11T21:29:06Z

No I don't believe this wouldn't require a modification of InboxOn, The issue is stemming from 7ee51be#diff-c7bf0a95d7488e5968fd7aeb0078fda2 which explicitly pinned the version of the ref which I think is OK. The error is saying the ref is lower version then the implementation which should be valid. I'm not sure why it is complaining, do we need to suppress this check @ericstj?

ericstj · 2018-09-11T21:38:24Z

That's happening because the supported framework is applied to the cross-targeting-csproj reference, which will pull the max of all versions from that ref.

corefx/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj

Lines 5 to 7 in 0173b41

    
           <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj"> 
        
             <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework> 
        
           </ProjectReference>

In this case the max will be the netfx version. Which is why this is failing.

@weshaggard dealt with the same issue here: 2414032#diff-1345536edae72c012e218f0374fa418cR6

In his case he gets the support checks for the other frameworks from harvesting. An alternate to this is to explicitly list SupportedFrameworks as follows:
https://github.com/dotnet/corefx/blob/a10890f4ffe0fadf090c922578ba0e606ebdd16c/Documentation/coding-guidelines/package-projects.md#applicability-validation

So the change would be:

<ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj"> 
  <SupportedFramework>net461</SupportedFramework> 
</ProjectReference> 
<SupportedFramework Include="netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)" >
  <Version>4.1.1.0</Version>
</SupportedFramework>

wtgodbe · 2018-09-11T22:53:53Z

Test failure was a Jenkins issue

@dotnet-bot test Windows x86 Release Build

Add missed packages to packages.builds for 2.1.5

b49d81a

weshaggard reviewed Sep 10, 2018

View reviewed changes

danmoseley added the Servicing-consider Issue for next servicing release review label Sep 10, 2018

Move PackageVersions to dir.props

ffc963b

karelz added the area-Infrastructure-libraries label Sep 10, 2018

karelz added this to the 2.1.x milestone Sep 10, 2018

karelz assigned wtgodbe Sep 10, 2018

weshaggard reviewed Sep 10, 2018

View reviewed changes

Add entries to packageindex.json

6056b1d

weshaggard approved these changes Sep 10, 2018

View reviewed changes

weshaggard mentioned this pull request Sep 11, 2018

Bump System.Drawing.Common assembly version #32108

Closed

Fix System.Drawing.Common assembly version to be the last number to n…

4e4dc12

…ot clash with master

weshaggard mentioned this pull request Sep 11, 2018

Merge in 2.1.4 changes #32229

Merged

danmoseley mentioned this pull request Sep 11, 2018

[release/2.1] Bump package version for S.S.C.Pkcs and add it to packages.builds #32111

Closed

jamshedd added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Sep 11, 2018

Bump InboxOn for DiagnosticSource

0e84b39

ViktorHofer reviewed Sep 11, 2018

View reviewed changes

Bump version in IL file

0173b41

Pin non-net461 Frameworks to 4.1.1.0

194c1ab

wtgodbe merged commit 047ad36 into dotnet:release/2.1 Sep 11, 2018

danmoseley modified the milestones: 2.1.x, 2.1.5 Sep 13, 2018

danmoseley added Servicing-approved Approved for servicing release and removed Servicing-approved Approved for servicing release labels Sep 13, 2018

Conversation

wtgodbe commented Sep 10, 2018 • edited by danmoseley Loading Uh oh! There was an error while loading. Please reload this page.

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!

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!

weshaggard left a comment

Choose a reason for hiding this comment

Uh oh!

safern commented Sep 11, 2018

Uh oh!

jamshedd commented Sep 11, 2018

Uh oh!

ViktorHofer Sep 11, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

weshaggard commented Sep 11, 2018

Uh oh!

wtgodbe commented Sep 11, 2018

Uh oh!

wtgodbe commented Sep 11, 2018

Uh oh!

weshaggard commented Sep 11, 2018

Uh oh!

ericstj commented Sep 11, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wtgodbe commented Sep 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

wtgodbe commented Sep 10, 2018 •

edited by danmoseley

Loading

ViktorHofer Sep 11, 2018 •

edited

Loading

ericstj commented Sep 11, 2018 •

edited

Loading