Backport master changes to 5.x #710

lukebakken · 2020-02-11T21:19:25Z

I am reviewing all changes to master since the 5.1.2 release and backporting all that are appropriate for a 5.2.0 release.

(cherry picked from commit 95daa2f)

Add additional headers (cherry picked from commit 0c45012)

(cherry picked from commit 4a18ddf)

lukebakken · 2020-02-11T23:25:50Z

@stebet - If I could ask a big favor. Could you please backport your changes in #687 to the lrb-master-backport-5.x branch? This process should work:

Update your fork of this repository (master and lrb-master-backport-5.x branches at least).
Create a branch based on lrb-master-backport-5.x
git cherry-pick -xm1 ebd7d215e6f9ce96a21f6f9bab119bb4097e568a
Fix merge conflicts! This is what trips me up every time.
Commit your branch, and open a PR using the lrb-master-backport-5.x branch as a base.

I really appreciate it.

stebet · 2020-02-12T21:10:04Z

Sure, I'll take a look at that tomorrow.

lukebakken · 2020-02-12T21:12:34Z

@stebet great thank you very much

bording · 2020-02-12T23:56:57Z

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

@@ -71,7 +71,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net451" Version="1.0.0" PrivateAssets="All" />


What failure were you seeing? You shouldn't need to directly reference those sub packages. That should be correctly handled by referencing the Microsoft.NETFramework.ReferenceAssemblies package.

On Linux and OS X builds -

https://gist.github.com/lukebakken/30d05fc5f03ee9ff47527e5d09864f26

This is the Vagrantfile that can bring up a Debian 10 VM with the same packages as our CI build - https://gist.github.com/lukebakken/676bb6d75e30aa5a0bc533f9af87a336

I have no idea what's up, just that these changes fix the builds! 🤷‍♂

That doesn't really make sense though, because those packages would already be referenced with the original reference.

You would need to add Microsoft.NETFramework.ReferenceAssemblies to the WinRT project, but shouldn't need to reference a specific one directly like that.

I will give the WinRT suggestion a try. That's probably it.

e7578bf works. The reference is required in all of those .csproj files.

Thanks for double-checking.

If you're still having a problem with that change, post the build log failure, and I'll see if I can figure it out.

Ultimately I guess it does't matter, but it always bothers me when there's something weird going on without an explanation why. 😄

Ah, should have refreshed before posting. Glad to see that solved it!

it always bothers me when there's something weird going on without an explanation why.

Me too, so thanks for checking. I don't have the time to dig into package / assembly / nuget issues and it's been long enough that I've been out of the .NET world that I'm quite rusty.

Things have also changed pretty dramatically with the introduction of PackageReferences and the new project system.

(cherry picked from commit 04518f1)

(cherry picked from commit db2f5a9)

(cherry picked from commit fca0136)

(cherry picked from commit 0ecf37d)

Use "dotnet build" command (cherry picked from commit 5b6bf18)

Remove unused files (cherry picked from commit 9e30a1b)

(cherry picked from commit 07c1936)

(cherry picked from commit 172ad8c)

(cherry picked from commit 308f37e)

(cherry picked from commit 6378d05)

@bording

Makes dotnet pack work. Kudos to @bording for figuring it out in #700. (cherry picked from commit 9b239f0)

Let operating system choose which TLS version to use (cherry picked from commit 57cb199)

Part of #514 (cherry picked from commit e296906)

(cherry picked from commit d0c5123)

(cherry picked from commit 1e07323)

🔎 Sourcelink added! (cherry picked from commit d81dd9d)

… fix build

Task backport to 5.x

bording · 2020-02-14T16:41:30Z

@lukebakken How closely did you look at the approval test changes in this branch to make sure there aren't breaking changes to types? That's my main concern with the backport process since breaking changes were okay when this stuff was merged into master.

lukebakken · 2020-02-14T16:45:35Z

Well I don't think there were changes to that but now you've got me double-checking...

This reverts commit ad20306, reversing changes made to 1fc9fcc.

lukebakken · 2020-02-14T16:59:57Z

Well that's super, changes made it in that I didn't expect. Re-re-re-checking.

lukebakken · 2020-02-14T17:03:57Z

Maybe not. I see that there is a package added for the approval tests, and the expectation file, but the actual test itself isn't run. Going to address that because it will determine if API changes were made.

stebet · 2020-02-17T09:04:52Z

If any of the task changes caused API changes, let me know so I can fix them. There shouldn't be any need to change the API and cause breaking changes for them.

lukebakken · 2020-02-18T17:29:42Z

I'm getting the API approval test running in the 5.x branch and then I'll know for sure. Thanks for checking in @stebet

Backport master changes to 5.x (cherry picked from commit ad20306)

michaelklishin and others added 2 commits February 11, 2020 13:12

README: clarify what double licensing means

30e0f6e

(cherry picked from commit 95daa2f)

Merge pull request #667 from sergeyshaykhullin/add-header-constants

b5e4dfb

Add additional headers (cherry picked from commit 0c45012)

lukebakken added this to the 5.2.0 milestone Feb 11, 2020

lukebakken self-assigned this Feb 11, 2020

lukebakken changed the base branch from master to 5.x February 11, 2020 21:19

Update API approvals test expectation

8e96d46

(cherry picked from commit 4a18ddf)

lukebakken mentioned this pull request Feb 11, 2020

Task optimizations and deadlock fix #687

Merged

7 tasks

bording reviewed Feb 12, 2020

View reviewed changes

kjnilsson and others added 19 commits February 12, 2020 16:08

Remove NuGet.Build.Tasks.Pack

5ba74df

(cherry picked from commit 04518f1)

Bump AppVeyor to use RabbitMQ 3.8.2

b336b61

(cherry picked from commit db2f5a9)

Use Erlang 22.2

c54d1f9

(cherry picked from commit fca0136)

Fix appveyor.yml

8e95d3a

(cherry picked from commit 0ecf37d)

Merge pull request #693 from rabbitmq/lrb-use-dotnet-build

9a2fe36

Use "dotnet build" command (cherry picked from commit 5b6bf18)

Merge pull request #695 from rabbitmq/lrb-remove-unused

a02a53a

Remove unused files (cherry picked from commit 9e30a1b)

simplify scripts

4a5385c

(cherry picked from commit 07c1936)

Minor README updates

63d7119

(cherry picked from commit 172ad8c)

Update (c) information post acquisition

8191cf6

(cherry picked from commit 308f37e)

Merge branch 'vbakaryuk-waitforconfirm-fix'

43683e6

(cherry picked from commit 6378d05)

Fixup after cherry-pick

012b307

Remove a dummy task

dbcc58d

Makes dotnet pack work. Kudos to @bording for figuring it out in #700. (cherry picked from commit 9b239f0)

Merge pull request #701 from rabbitmq/lrb-fix-sslprotocols

edd50d7

Let operating system choose which TLS version to use (cherry picked from commit 57cb199)

Fixup after cherry-pick

e378d64

Remove last vestiges of RabbitMQ.Client.MessagePatterns

060c0ab

Part of #514 (cherry picked from commit e296906)

An insignificant (c) change to ASL2 license headers

9f22003

(cherry picked from commit d0c5123)

Remove unused variables from AppVeyor build

b72ffbf

(cherry picked from commit 1e07323)

Merge pull request #704 from PureKrome/sourcelink-denug-all-the-things

d648ef0

🔎 Sourcelink added! (cherry picked from commit d81dd9d)

Add correct versions of Microsoft.NETFramework.ReferenceAssemblies to…

e7578bf

… fix build

lukebakken force-pushed the lrb-master-backport-5.x branch from cba2b26 to e7578bf Compare February 13, 2020 00:09

michaelklishin and others added 3 commits February 13, 2020 10:12

Merge branch 'stebet-taskOptimizations'

e55bd55

Cherry-picking task changes.

fc98a3e

Merge pull request #711 from stebet/taskBackport

dc91b1d

Task backport to 5.x

lukebakken marked this pull request as ready for review February 14, 2020 16:05

lukebakken merged commit ad20306 into 5.x Feb 14, 2020

lukebakken deleted the lrb-master-backport-5.x branch February 14, 2020 16:24

lukebakken added a commit that referenced this pull request Feb 14, 2020

Revert "Merge pull request #710 from rabbitmq/lrb-master-backport-5.x"

f089c7d

This reverts commit ad20306, reversing changes made to 1fc9fcc.

lukebakken restored the lrb-master-backport-5.x branch February 14, 2020 17:00

lukebakken added a commit that referenced this pull request Feb 20, 2020

Merge pull request #710 from rabbitmq/lrb-master-backport-5.x

7791adf

Backport master changes to 5.x (cherry picked from commit ad20306)

lukebakken deleted the lrb-master-backport-5.x branch February 20, 2020 22:44

lukebakken mentioned this pull request Feb 20, 2020

Backport master changes to 5.x #722

Merged

Backport master changes to 5.x #710

Backport master changes to 5.x #710

Uh oh!

Conversation

lukebakken commented Feb 11, 2020

Uh oh!

lukebakken commented Feb 11, 2020

Uh oh!

stebet commented Feb 12, 2020

Uh oh!

lukebakken commented Feb 12, 2020

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bording commented Feb 14, 2020

Uh oh!

lukebakken commented Feb 14, 2020

Uh oh!

lukebakken commented Feb 14, 2020

Uh oh!

lukebakken commented Feb 14, 2020

Uh oh!

stebet commented Feb 17, 2020

Uh oh!

lukebakken commented Feb 18, 2020

Uh oh!

Uh oh!