From b49d81a73122965b01df9380db44597d950a9863 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 10 Sep 2018 14:11:33 -0700 Subject: [PATCH 1/7] Add missed packages to packages.builds for 2.1.5 --- .../dir.props | 2 +- ...ystem.Diagnostics.DiagnosticSource.pkgproj | 3 +++ src/System.IO.Pipelines/dir.props | 2 +- .../pkg/System.IO.Pipelines.pkgproj | 3 +++ src/System.Net.Http.WinHttpHandler/dir.props | 2 +- .../System.Net.Http.WinHttpHandler.pkgproj | 3 +++ .../dir.props | 4 ++-- .../dir.props | 2 +- ...em.Runtime.CompilerServices.Unsafe.pkgproj | 2 +- .../dir.props | 2 +- .../System.Security.Cryptography.Pkcs.pkgproj | 3 +++ .../dir.props | 2 +- .../System.Security.Principal.Windows.pkgproj | 3 +++ src/packages.builds | 21 +++++++++++++++++++ 14 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/System.Diagnostics.DiagnosticSource/dir.props b/src/System.Diagnostics.DiagnosticSource/dir.props index 04f0db761979..37dc0e2ca849 100644 --- a/src/System.Diagnostics.DiagnosticSource/dir.props +++ b/src/System.Diagnostics.DiagnosticSource/dir.props @@ -2,7 +2,7 @@ - 4.0.3.0 + 4.0.3.1 Open true true diff --git a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj index 93ce39ab4ab8..5a29e37a2826 100644 --- a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj +++ b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj @@ -1,6 +1,9 @@  + + 4.5.1 + net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks) diff --git a/src/System.IO.Pipelines/dir.props b/src/System.IO.Pipelines/dir.props index 4356decc45ef..1da51230da71 100644 --- a/src/System.IO.Pipelines/dir.props +++ b/src/System.IO.Pipelines/dir.props @@ -2,7 +2,7 @@ - 4.0.0.0 + 4.0.0.1 Open \ No newline at end of file diff --git a/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj b/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj index 80de0bf4011b..df09ebfab8c8 100644 --- a/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj +++ b/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj @@ -1,6 +1,9 @@  + + 4.5.2 + net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks) diff --git a/src/System.Net.Http.WinHttpHandler/dir.props b/src/System.Net.Http.WinHttpHandler/dir.props index 884a835fb089..35a8e1ca330d 100644 --- a/src/System.Net.Http.WinHttpHandler/dir.props +++ b/src/System.Net.Http.WinHttpHandler/dir.props @@ -2,7 +2,7 @@ - 4.0.3.0 + 4.0.3.1 MSFT \ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj index bb6883ec8b10..b03a68217652 100644 --- a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj +++ b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj @@ -1,6 +1,9 @@  + + 4.5.1 + net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/src/System.Net.WebSockets.WebSocketProtocol/dir.props b/src/System.Net.WebSockets.WebSocketProtocol/dir.props index a3d5f7bc641f..f1969129f764 100644 --- a/src/System.Net.WebSockets.WebSocketProtocol/dir.props +++ b/src/System.Net.WebSockets.WebSocketProtocol/dir.props @@ -2,8 +2,8 @@ - 4.5.1 - 4.0.0.0 + 4.5.2 + 4.0.0.1 Open \ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/dir.props b/src/System.Runtime.CompilerServices.Unsafe/dir.props index 41debf92d39f..ed82aaf1945b 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/dir.props +++ b/src/System.Runtime.CompilerServices.Unsafe/dir.props @@ -2,7 +2,7 @@ - 4.0.4.0 + 4.0.4.1 MSFT true diff --git a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj index 270264c36139..28e16b9b77b0 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj +++ b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj @@ -2,7 +2,7 @@ - 4.5.1 + 4.5.2 diff --git a/src/System.Security.Cryptography.Pkcs/dir.props b/src/System.Security.Cryptography.Pkcs/dir.props index 884a835fb089..35a8e1ca330d 100644 --- a/src/System.Security.Cryptography.Pkcs/dir.props +++ b/src/System.Security.Cryptography.Pkcs/dir.props @@ -2,7 +2,7 @@ - 4.0.3.0 + 4.0.3.1 MSFT \ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj index 234c84175e0f..724ae47f74c0 100644 --- a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj +++ b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj @@ -1,6 +1,9 @@  + + 4.5.1 + net461;netcoreapp2.1;$(AllXamarinFrameworks) diff --git a/src/System.Security.Principal.Windows/dir.props b/src/System.Security.Principal.Windows/dir.props index 4bb96edee4d3..c39a1e4a4b69 100644 --- a/src/System.Security.Principal.Windows/dir.props +++ b/src/System.Security.Principal.Windows/dir.props @@ -2,7 +2,7 @@ - 4.1.1.0 + 4.1.1.1 MSFT true false diff --git a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index 989307586910..23bd3db1c3eb 100644 --- a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -1,6 +1,9 @@  + + 4.5.1 + net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks) diff --git a/src/packages.builds b/src/packages.builds index 5f4d49c67406..f7faa5efd96a 100644 --- a/src/packages.builds +++ b/src/packages.builds @@ -27,6 +27,27 @@ $(AdditionalProperties) + + $(AdditionalProperties) + + + $(AdditionalProperties) + + + $(AdditionalProperties) + + + $(AdditionalProperties) + + + $(AdditionalProperties) + + + $(AdditionalProperties) + + + $(AdditionalProperties) + From ffc963b6224111f9837166305266f0993a10b776 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 10 Sep 2018 14:27:30 -0700 Subject: [PATCH 2/7] Move PackageVersions to dir.props --- src/System.Diagnostics.DiagnosticSource/dir.props | 1 + .../pkg/System.Diagnostics.DiagnosticSource.pkgproj | 3 --- src/System.IO.Pipelines/dir.props | 1 + src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj | 3 --- src/System.Net.Http.WinHttpHandler/dir.props | 1 + .../pkg/System.Net.Http.WinHttpHandler.pkgproj | 3 --- src/System.Runtime.CompilerServices.Unsafe/dir.props | 1 + .../pkg/System.Runtime.CompilerServices.Unsafe.pkgproj | 3 --- src/System.Security.Cryptography.Pkcs/dir.props | 1 + .../pkg/System.Security.Cryptography.Pkcs.pkgproj | 3 --- src/System.Security.Principal.Windows/dir.props | 1 + .../pkg/System.Security.Principal.Windows.pkgproj | 3 --- 12 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/System.Diagnostics.DiagnosticSource/dir.props b/src/System.Diagnostics.DiagnosticSource/dir.props index 37dc0e2ca849..bf9e45b6deeb 100644 --- a/src/System.Diagnostics.DiagnosticSource/dir.props +++ b/src/System.Diagnostics.DiagnosticSource/dir.props @@ -3,6 +3,7 @@ 4.0.3.1 + 4.5.1 Open true true diff --git a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj index 5a29e37a2826..93ce39ab4ab8 100644 --- a/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj +++ b/src/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj @@ -1,9 +1,6 @@  - - 4.5.1 - net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks) diff --git a/src/System.IO.Pipelines/dir.props b/src/System.IO.Pipelines/dir.props index 1da51230da71..0579481bc7a8 100644 --- a/src/System.IO.Pipelines/dir.props +++ b/src/System.IO.Pipelines/dir.props @@ -3,6 +3,7 @@ 4.0.0.1 + 4.5.2 Open \ No newline at end of file diff --git a/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj b/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj index df09ebfab8c8..80de0bf4011b 100644 --- a/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj +++ b/src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj @@ -1,9 +1,6 @@  - - 4.5.2 - net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks) diff --git a/src/System.Net.Http.WinHttpHandler/dir.props b/src/System.Net.Http.WinHttpHandler/dir.props index 35a8e1ca330d..ee03ad82c2cb 100644 --- a/src/System.Net.Http.WinHttpHandler/dir.props +++ b/src/System.Net.Http.WinHttpHandler/dir.props @@ -3,6 +3,7 @@ 4.0.3.1 + 4.5.1 MSFT \ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj index b03a68217652..bb6883ec8b10 100644 --- a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj +++ b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj @@ -1,9 +1,6 @@  - - 4.5.1 - net461;netcoreapp2.0;$(AllXamarinFrameworks) diff --git a/src/System.Runtime.CompilerServices.Unsafe/dir.props b/src/System.Runtime.CompilerServices.Unsafe/dir.props index ed82aaf1945b..d14601b4f2a5 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/dir.props +++ b/src/System.Runtime.CompilerServices.Unsafe/dir.props @@ -3,6 +3,7 @@ 4.0.4.1 + 4.5.2 MSFT true diff --git a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj index 28e16b9b77b0..1f13bc9c19cd 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj +++ b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj @@ -1,9 +1,6 @@  - - 4.5.2 - diff --git a/src/System.Security.Cryptography.Pkcs/dir.props b/src/System.Security.Cryptography.Pkcs/dir.props index 35a8e1ca330d..ee03ad82c2cb 100644 --- a/src/System.Security.Cryptography.Pkcs/dir.props +++ b/src/System.Security.Cryptography.Pkcs/dir.props @@ -3,6 +3,7 @@ 4.0.3.1 + 4.5.1 MSFT \ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj index 724ae47f74c0..234c84175e0f 100644 --- a/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj +++ b/src/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj @@ -1,9 +1,6 @@  - - 4.5.1 - net461;netcoreapp2.1;$(AllXamarinFrameworks) diff --git a/src/System.Security.Principal.Windows/dir.props b/src/System.Security.Principal.Windows/dir.props index c39a1e4a4b69..f41e45edf641 100644 --- a/src/System.Security.Principal.Windows/dir.props +++ b/src/System.Security.Principal.Windows/dir.props @@ -3,6 +3,7 @@ 4.1.1.1 + 4.5.1 MSFT true false diff --git a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index 23bd3db1c3eb..989307586910 100644 --- a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -1,9 +1,6 @@  - - 4.5.1 - net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks) From 6056b1d867475559952fac608bb22036b855a2b2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 10 Sep 2018 16:20:42 -0700 Subject: [PATCH 3/7] Add entries to packageindex.json --- .../packageIndex.json | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index b62e952942ee..a6a31e7ed0ab 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1393,7 +1393,8 @@ "4.0.1.0": "4.3.0", "4.0.2.0": "4.4.0", "4.0.2.1": "4.4.1", - "4.0.3.0": "4.5.0" + "4.0.3.0": "4.5.0", + "4.0.3.1": "4.5.1" } }, "System.Diagnostics.EventLog": { @@ -2211,7 +2212,8 @@ ], "InboxOn": {}, "AssemblyVersionInPackageVersion": { - "4.0.0.0": "4.5.0" + "4.0.0.0": "4.5.1", + "4.0.0.1": "4.5.2" } }, "System.IO.Pipes": { @@ -2627,7 +2629,8 @@ "4.0.0.0": "4.0.0", "4.0.1.0": "4.3.0", "4.0.2.0": "4.4.0", - "4.0.3.0": "4.5.0" + "4.0.3.0": "4.5.0", + "4.0.3.1": "4.5.1" } }, "System.Net.HttpListener": { @@ -3005,7 +3008,8 @@ ], "InboxOn": {}, "AssemblyVersionInPackageVersion": { - "4.0.0.0": "4.5.0" + "4.0.0.0": "4.5.1", + "4.0.0.1": "4.5.2" } }, "System.Numerics": { @@ -3615,7 +3619,8 @@ ], "InboxOn": {}, "AssemblyVersionInPackageVersion": { - "4.0.4.0": "4.5.0" + "4.0.4.0": "4.5.1", + "4.0.4.1": "4.5.2" } }, "System.Runtime.CompilerServices.VisualC": { @@ -4293,7 +4298,8 @@ "4.0.0.0": "4.0.0", "4.0.1.0": "4.3.0", "4.0.2.0": "4.4.0", - "4.0.3.0": "4.5.0" + "4.0.3.0": "4.5.0", + "4.0.3.1": "4.5.1" } }, "System.Security.Cryptography.Primitives": { @@ -4447,7 +4453,8 @@ "4.0.0.0": "4.0.0", "4.0.1.0": "4.3.0", "4.1.0.0": "4.4.0", - "4.1.1.0": "4.5.0" + "4.1.1.0": "4.5.0", + "4.1.1.1": "4.5.1" } }, "System.Security.SecureString": { From 4e4dc12d88fdb477c3dd48171459de553de30a60 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 11 Sep 2018 10:15:52 -0700 Subject: [PATCH 4/7] Fix System.Drawing.Common assembly version to be the last number to not clash with master --- pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 2 +- src/System.Drawing.Common/dir.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index a6a31e7ed0ab..29768ae29ec4 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1693,7 +1693,7 @@ }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.5.0", - "4.0.1.0": "4.5.1" + "4.0.0.1": "4.5.1" } }, "System.Drawing.Design": { diff --git a/src/System.Drawing.Common/dir.props b/src/System.Drawing.Common/dir.props index fe7a68cb8954..73d9ff2c9564 100644 --- a/src/System.Drawing.Common/dir.props +++ b/src/System.Drawing.Common/dir.props @@ -2,7 +2,7 @@ - 4.0.1.0 + 4.0.0.1 Open 4.5.1 From 0e84b39fef10d6f220258b44a9698ccb2f364ee2 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Sep 2018 11:51:24 -0700 Subject: [PATCH 5/7] Bump InboxOn for DiagnosticSource --- pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 29768ae29ec4..b28109a9474b 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1386,7 +1386,7 @@ "BaselineVersion": "4.4.1", "InboxOn": { "netcoreapp2.0": "4.0.2.1", - "netcoreapp2.1": "4.0.3.0" + "netcoreapp2.1": "4.0.3.1" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -5772,4 +5772,4 @@ "System.Xml.XDocument" ] } -} \ No newline at end of file +} From 0173b4186256de4d6445890b9e5a5ba6a22325c0 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Sep 2018 13:23:19 -0700 Subject: [PATCH 6/7] Bump version in IL file --- .../src/System.Runtime.CompilerServices.Unsafe.il | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il index 891f9ac2015a..a7f881550e84 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il +++ b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il @@ -37,7 +37,7 @@ 01 00 00 00 00 ) // false .hash algorithm 0x00008004 - .ver 4:0:4:0 + .ver 4:0:4:1 } .module System.Runtime.CompilerServices.Unsafe.dll // MVID: {1E97D84A-565B-49C5-B60A-F31A1A4ACE13} From 194c1abd3ea079223fc2fb3f74db0a91dd0849a3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Sep 2018 14:54:23 -0700 Subject: [PATCH 7/7] Pin non-net461 Frameworks to 4.1.1.0 --- .../pkg/System.Security.Principal.Windows.pkgproj | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index 989307586910..6d466a4e1012 100644 --- a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -2,9 +2,12 @@ - - net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks) - + + net461 + + + 4.1.1.0 + runtimes/win/lib/uap10.0.16299 @@ -17,4 +20,4 @@ - \ No newline at end of file +