Skip to content

Commit a505c46

Browse files
AnipikAnipik
authored
update assemblyVersion, packageIndex & resources data (#44373)
* updated package indes * Fix the failures in all config build * add "5.0.0.0" : "5.0.0" entry * correct the system.net.quic and system.security.access control * add inbox libraries for net6.0 * fix system.net.quic * disable closure verify for net6.0 * harvest net5.0 asset and include net6.0 asset in package * some extra changes reverted * updating some other assembly verisons * remove package version and use major and minor version to get the assembly version * Update Directory.Build.props
1 parent 21dc074 commit a505c46

File tree

16 files changed

+604
-249
lines changed

16 files changed

+604
-249
lines changed

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
1313
<!-- Changing assembly versions without changing TFM lead to broken packages.
1414
This shoud be incremented after introducing the 6.0 TFM. -->
15-
<AssemblyVersion>5.0.0.0</AssemblyVersion>
15+
<AssemblyVersion>6.0.0.0</AssemblyVersion>
1616
<!-- Enable to remove prerelease label. -->
1717
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1818
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

‎src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<MajorVersion>$([MSBuild]::Add($(MajorVersion), 6))</MajorVersion>
5-
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
6-
<AssemblyVersion>10.0.6.0</AssemblyVersion>
4+
<AssemblyVersion>$([MSBuild]::Add($(MajorVersion), 5)).$(MinorVersion).0.0</AssemblyVersion>
75
<StrongNameKeyId>Microsoft</StrongNameKeyId>
86
<IncludePlatformAttributes>true</IncludePlatformAttributes>
97
</PropertyGroup>
10-
</Project>
8+
</Project>

‎src/libraries/System.Formats.Cbor/pkg/System.Formats.Cbor.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33
<ItemGroup>
44
<ProjectReference Include="..\src\System.Formats.Cbor.csproj">
5-
<SupportedFramework>$(NetCoreAppCurrent)</SupportedFramework>
5+
<SupportedFramework>net5.0</SupportedFramework>
66
</ProjectReference>
77
</ItemGroup>
88
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

‎src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreAppCurrent);net5.0</TargetFrameworks>
4+
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
45
<Nullable>enable</Nullable>
56
</PropertyGroup>
67
<ItemGroup>
78
<Compile Include="System.Formats.Cbor.cs" />
89
</ItemGroup>
9-
<ItemGroup>
10+
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
11+
<Reference Include="System.Runtime" />
12+
<Reference Include="System.Runtime.Numerics" />
13+
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFramework)' != 'net5.0'">
1015
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" />
1116
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Numerics\ref\System.Runtime.Numerics.csproj" />
1217
</ItemGroup>

‎src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
3+
<TargetFrameworks>net5.0;$(NetCoreAppCurrent)</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5+
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
56
<Nullable>enable</Nullable>
67
</PropertyGroup>
78
<ItemGroup>

‎src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<HarvestIncludePaths Include="ref/netstandard1.3;lib/netstandard1.3" />
1010
<HarvestIncludePaths Include="ref/netstandard2.0;lib/netstandard2.0" />
1111
<HarvestIncludePaths Include="runtimes/win/lib/netcoreapp2.1" />
12+
<HarvestIncludePaths Include="ref/net5.0;lib/net5.0;runtimes/win/lib/net5.0" />
1213
<ProjectReference Include="..\src\System.IO.Pipes.AccessControl.csproj" />
1314
</ItemGroup>
1415
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

‎src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33
<ItemGroup>
44
<ProjectReference Include="..\ref\System.IO.Ports.csproj">
5-
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
5+
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
66
</ProjectReference>
7-
<File Include="$(PlaceHolderFile)">
8-
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
9-
</File>
10-
<InboxOnTargetFramework Include="uap10.0.16299" />
117
<ProjectReference Include="..\src\System.IO.Ports.csproj" />
128
</ItemGroup>
139
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

‎src/libraries/System.Resources.Extensions/tests/TestData.resources‎

0 Bytes
Binary file not shown.

‎src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33
<ItemGroup>
44
<ProjectReference Include="..\ref\System.Security.AccessControl.csproj">
5-
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
5+
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
66
</ProjectReference>
7-
<File Include="$(PlaceHolderFile)">
8-
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
9-
</File>
10-
<InboxOnTargetFramework Include="uap10.0.16299" />
117
<ProjectReference Include="..\src\System.Security.AccessControl.csproj" />
128
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
139
<HarvestIncludePaths Include="ref/netstandard1.3">

‎src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
4-
<TargetFrameworks>$(NetCoreAppCurrent)-windows;net461-windows;netcoreapp2.0-windows;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>$(NetCoreAppCurrent)-windows;net461-windows;netstandard2.0-windows;netstandard2.0</TargetFrameworks>
55
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
99
<PropertyGroup>
1010
<IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly>
11-
<GeneratePlatformNotSupportedAssemblyMessage Condition="$(TargetFramework.StartsWith('netstandard'))">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
11+
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
1212
</PropertyGroup>
13-
<ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2.0'))">
13+
<ItemGroup Condition="!$(TargetFramework.StartsWith('net4')) and '$(TargetsWindows)' == 'true'">
1414
<Compile Include="System\Security\AccessControl\ACE.cs" />
1515
<Compile Include="System\Security\AccessControl\ACL.cs" />
1616
<Compile Include="System\Security\AccessControl\CommonObjectSecurity.cs" />
@@ -78,8 +78,7 @@
7878
<Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DuplicateTokenEx_SafeTokenHandle.cs"
7979
Link="Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs" />
8080
</ItemGroup>
81-
<ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or
82-
$(TargetFramework.StartsWith('netcoreapp2.0'))">
81+
<ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))">
8382
<Reference Include="System.Collections" />
8483
<Reference Include="System.Collections.NonGeneric" />
8584
<Reference Include="System.Diagnostics.Debug" />

0 commit comments

Comments
 (0)