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

eng/Versions.props

@@ -12,7 +12,7 @@
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <!-- Changing assembly versions without changing TFM lead to broken packages.
          This shoud be incremented after introducing the 6.0 TFM. -->
-    <AssemblyVersion>5.0.0.0</AssemblyVersion>
+    <AssemblyVersion>6.0.0.0</AssemblyVersion>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

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

 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <MajorVersion>$([MSBuild]::Add($(MajorVersion), 6))</MajorVersion>
-    <PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
-    <AssemblyVersion>10.0.6.0</AssemblyVersion>
+    <AssemblyVersion>$([MSBuild]::Add($(MajorVersion), 5)).$(MinorVersion).0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

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

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Formats.Cbor.csproj">
-      <SupportedFramework>$(NetCoreAppCurrent)</SupportedFramework>
+      <SupportedFramework>net5.0</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

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

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);net5.0</TargetFrameworks>
+    <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Formats.Cbor.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Numerics" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0'">
     <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Numerics\ref\System.Runtime.Numerics.csproj" />
   </ItemGroup>

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

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFrameworks>net5.0;$(NetCoreAppCurrent)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

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

@@ -9,6 +9,7 @@
     <HarvestIncludePaths Include="ref/netstandard1.3;lib/netstandard1.3" />
     <HarvestIncludePaths Include="ref/netstandard2.0;lib/netstandard2.0" />
     <HarvestIncludePaths Include="runtimes/win/lib/netcoreapp2.1" />
+    <HarvestIncludePaths Include="ref/net5.0;lib/net5.0;runtimes/win/lib/net5.0" />
     <ProjectReference Include="..\src\System.IO.Pipes.AccessControl.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

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

@@ -2,12 +2,8 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Ports.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
-    <File Include="$(PlaceHolderFile)">
-      <TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
-    </File>
-    <InboxOnTargetFramework Include="uap10.0.16299" />
     <ProjectReference Include="..\src\System.IO.Ports.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

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

@@ -2,12 +2,8 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.AccessControl.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
-    <File Include="$(PlaceHolderFile)">
-      <TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
-    </File>
-    <InboxOnTargetFramework Include="uap10.0.16299" />
     <ProjectReference Include="..\src\System.Security.AccessControl.csproj" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
     <HarvestIncludePaths Include="ref/netstandard1.3">

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

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)-windows;net461-windows;netcoreapp2.0-windows;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-windows;net461-windows;netstandard2.0-windows;netstandard2.0</TargetFrameworks>
     <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="$(TargetFramework.StartsWith('netstandard'))">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2.0'))">
+  <ItemGroup Condition="!$(TargetFramework.StartsWith('net4')) and '$(TargetsWindows)' == 'true'">
     <Compile Include="System\Security\AccessControl\ACE.cs" />
     <Compile Include="System\Security\AccessControl\ACL.cs" />
     <Compile Include="System\Security\AccessControl\CommonObjectSecurity.cs" />
@@ -78,8 +78,7 @@
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DuplicateTokenEx_SafeTokenHandle.cs"
              Link="Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or
-                        $(TargetFramework.StartsWith('netcoreapp2.0'))">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))">
     <Reference Include="System.Collections" />
     <Reference Include="System.Collections.NonGeneric" />
     <Reference Include="System.Diagnostics.Debug" />

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

@@ -2,13 +2,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Principal.Windows.csproj" />
-    <File Include="$(PlaceHolderFile)">
-      <TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
-    </File>
-    <InboxOnTargetFramework Include="uap10.0.16299" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
     <HarvestIncludePaths Include="ref/netstandard1.3;runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
     <!-- this package is part of the implementation closure of NETStandard.Library

src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netstandard2.0;netcoreapp2.0-windows;netcoreapp2.0-Unix;netcoreapp2.1-windows;netcoreapp2.1-Unix;net461-windows</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netstandard2.0;netstandard2.0-windows;netstandard2.0-Unix;netcoreapp2.1-windows;netcoreapp2.1-Unix;net461-windows</TargetFrameworks>
     <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -18,7 +18,7 @@
     <Nullable>annotations</Nullable>
   </PropertyGroup>
 
-  <ItemGroup Condition="($(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2'))) and '$(TargetsWindows)' == 'true'">
+  <ItemGroup Condition="!$(TargetFramework.StartsWith('net4')) and '$(TargetsWindows)' == 'true'">
     <Compile Include="Microsoft\Win32\SafeHandles\SafeAccessTokenHandle.cs" />
     <Compile Include="System\Security\Principal\IdentityNotMappedException.cs" />
     <Compile Include="System\Security\Principal\IdentityReference.cs" />
@@ -129,8 +129,6 @@
              Link="Common\Microsoft\Win32\SafeHandles\SafeLsaPolicyHandle.cs" />
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLsaReturnBufferHandle.cs"
              Link="Common\Microsoft\Win32\SafeHandles\SafeLsaReturnBufferHandle.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="($(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2'))) and '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CheckTokenMembership.cs"
              Link="Common\Interop\Interop.CheckTokenMembership.cs" />
   </ItemGroup>

src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/SID.cs

@@ -314,7 +314,7 @@ public sealed class SecurityIdentifier : IdentityReference, IComparable<Security
 
         [MemberNotNull(nameof(_binaryForm))]
         [MemberNotNull(nameof(_subAuthorities))]
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
         private void CreateFromParts(IdentifierAuthority identifierAuthority, int[] subAuthorities)
 #else
         private void CreateFromParts(IdentifierAuthority identifierAuthority, ReadOnlySpan<int> subAuthorities)
@@ -350,7 +350,7 @@ private void CreateFromParts(IdentifierAuthority identifierAuthority, ReadOnlySp
             //
 
             _identifierAuthority = identifierAuthority;
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
             _subAuthorities = (int[])subAuthorities.Clone();
 #else
             _subAuthorities = subAuthorities.ToArray();
@@ -462,7 +462,7 @@ private void CreateFromBinaryForm(byte[] binaryForm, int offset)
                 throw new ArgumentException(SR.ArgumentOutOfRange_ArrayTooSmall, nameof(binaryForm));
             }
 
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
             int[] subAuthorities = new int[subAuthoritiesLength];
 #else
             Span<int> subAuthorities = stackalloc int[MaxSubAuthorities];
@@ -494,7 +494,7 @@ private void CreateFromBinaryForm(byte[] binaryForm, int offset)
 
             CreateFromParts(
                 authority,
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
                 subAuthorities
 #else
                 subAuthorities.Slice(0, subAuthoritiesLength)
@@ -657,7 +657,7 @@ public SecurityIdentifier(WellKnownSidType sidType, SecurityIdentifier? domainSi
             CreateFromBinaryForm(resultSid!, 0);
         }
 
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
         internal SecurityIdentifier(IdentifierAuthority identifierAuthority, int[] subAuthorities)
 #else
         internal SecurityIdentifier(IdentifierAuthority identifierAuthority, ReadOnlySpan<int> subAuthorities)
@@ -748,7 +748,7 @@ public override string ToString()
                 // otherwise you would see this: "S-1-NTAuthority-32-544"
                 //
 
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
                 StringBuilder result = new StringBuilder();
                 result.Append("S-1-").Append((ulong)_identifierAuthority);
                 for (int i = 0; i < SubAuthorityCount; i++)

src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsPrincipal.cs

@@ -121,7 +121,7 @@ public virtual bool IsInRole(int rid)
             return IsInRole(
                 new SecurityIdentifier(
                     IdentifierAuthority.NTAuthority,
-#if NETCOREAPP2_0
+#if NETSTANDARD2_0
                     new
 #else
                     stackalloc

src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets

 <Project>
   <PropertyGroup>
     <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
+    <!-- This should be enabled once we have updated assembly versions. -->
+    <ShouldVerifyClosure>false</ShouldVerifyClosure>
   </PropertyGroup>
 
   <ItemGroup>