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

Add missed packages to packages.builds for 2.1.5 #32203

Merged
wtgodbe merged 7 commits into from
Sep 11, 2018
Merged

Add missed packages to packages.builds for 2.1.5 #32203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b49d81a
Add missed packages to packages.builds for 2.1.5
wtgodbe Sep 10, 2018
ffc963b
Move PackageVersions to dir.props
wtgodbe Sep 10, 2018
6056b1d
Add entries to packageindex.json
wtgodbe Sep 10, 2018
4e4dc12
Fix System.Drawing.Common assembly version to be the last number to n…
safern Sep 11, 2018
0e84b39
Bump InboxOn for DiagnosticSource
wtgodbe Sep 11, 2018
0173b41
Bump version in IL file
wtgodbe Sep 11, 2018
194c1ab
Pin non-net461 Frameworks to 4.1.1.0
wtgodbe Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,14 +1386,15 @@
"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",
"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": {
Expand Down Expand Up @@ -1692,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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -3005,7 +3008,8 @@
],
"InboxOn": {},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.5.0"
"4.0.0.0": "4.5.1",
Copy link
Member

@ViktorHofer ViktorHofer Sep 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

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.

Copy link
Member

@weshaggard weshaggard Sep 11, 2018

Choose a reason for hiding this comment

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

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.

Copy link
Member

@ViktorHofer ViktorHofer Sep 11, 2018

Choose a reason for hiding this comment

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

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

"4.0.0.1": "4.5.2"
}
},
"System.Numerics": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -5765,4 +5772,4 @@
"System.Xml.XDocument"
]
}
}
}
3 changes: 2 additions & 1 deletion src/System.Diagnostics.DiagnosticSource/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.3.0</AssemblyVersion>
<AssemblyVersion>4.0.3.1</AssemblyVersion>
<PackageVersion>4.5.1</PackageVersion>
<AssemblyKey>Open</AssemblyKey>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Drawing.Common/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.1.0</AssemblyVersion>
<AssemblyVersion>4.0.0.1</AssemblyVersion>
<AssemblyKey>Open</AssemblyKey>
<PackageVersion>4.5.1</PackageVersion>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/System.IO.Pipelines/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<AssemblyVersion>4.0.0.1</AssemblyVersion>
Copy link
Member

@weshaggard weshaggard Sep 10, 2018

Choose a reason for hiding this comment

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

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

<PackageVersion>4.5.2</PackageVersion>
<AssemblyKey>Open</AssemblyKey>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/System.Net.Http.WinHttpHandler/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.3.0</AssemblyVersion>
<AssemblyVersion>4.0.3.1</AssemblyVersion>
<PackageVersion>4.5.1</PackageVersion>
<AssemblyKey>MSFT</AssemblyKey>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/System.Net.WebSockets.WebSocketProtocol/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<PackageVersion>4.5.1</PackageVersion>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<PackageVersion>4.5.2</PackageVersion>
<AssemblyVersion>4.0.0.1</AssemblyVersion>
<AssemblyKey>Open</AssemblyKey>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/System.Runtime.CompilerServices.Unsafe/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.4.0</AssemblyVersion>
<AssemblyVersion>4.0.4.1</AssemblyVersion>
<PackageVersion>4.5.2</PackageVersion>
<AssemblyKey>MSFT</AssemblyKey>
<IsUAP>true</IsUAP>
</PropertyGroup>
Expand Down
3 changes: 0 additions & 3 deletions ...System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<?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>
<PackageVersion>4.5.1</PackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageIndex Include="$(ProjectDir)\pkg\baseline\packageBaseline.1.1.json" />
<ProjectReference Include="..\ref\System.Runtime.CompilerServices.Unsafe.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion src/System.Security.Cryptography.Pkcs/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.3.0</AssemblyVersion>
<AssemblyVersion>4.0.3.1</AssemblyVersion>
Copy link
Member

@weshaggard weshaggard Sep 10, 2018

Choose a reason for hiding this comment

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

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.

Copy link
Member

@bartonjs bartonjs Sep 10, 2018

Choose a reason for hiding this comment

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

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

Copy link
Member

@weshaggard weshaggard Sep 10, 2018

Choose a reason for hiding this comment

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

I suspect so.

Copy link
Member Author

@wtgodbe wtgodbe Sep 10, 2018

Choose a reason for hiding this comment

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

@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.

Copy link
Member

@weshaggard weshaggard Sep 10, 2018

Choose a reason for hiding this comment

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

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

<PackageVersion>4.5.1</PackageVersion>
<AssemblyKey>MSFT</AssemblyKey>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/System.Security.Principal.Windows/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
<AssemblyVersion>4.1.1.1</AssemblyVersion>
<PackageVersion>4.5.1</PackageVersion>
<AssemblyKey>MSFT</AssemblyKey>
<IsNETCoreApp>true</IsNETCoreApp>
<IsNETCoreAppRef>false</IsNETCoreAppRef>
Expand Down
11 changes: 7 additions & 4 deletions src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<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>
<ProjectReference Include="..\src\System.Security.Principal.Windows.csproj" />
<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
Expand All @@ -17,4 +20,4 @@
<SuppressMetaPackage Include="NETStandard.Library" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>
21 changes: 21 additions & 0 deletions src/packages.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,27 @@
<Project Include="$(MSBuildThisFileDirectory)System.Drawing.Common\pkg\System.Drawing.Common.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.IO.Pipelines\pkg\System.IO.Pipelines.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Pkcs\pkg\System.Security.Cryptography.Pkcs.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Net.WebSockets.WebSocketProtocol\pkg\System.Net.WebSockets.WebSocketProtocol.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Security.Principal.Windows\pkg\System.Security.Principal.Windows.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Net.Http.WinHttpHandler\pkg\System.Net.Http.WinHttpHandler.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\pkg\System.Diagnostics.DiagnosticSource.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe\pkg\System.Runtime.CompilerServices.Unsafe.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
</ItemGroup>

<!-- Need the PackageIndexFile file property from baseline.props -->
Expand Down