Harvest Security.Cryptography.Cng ns1.3 and ns1.4 implementations

dotnet · Sep 12, 2018 · 0faf4f1 · 0faf4f1
1 parent b526bb9
commit 0faf4f1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
@@ -13,8 +13,8 @@
  <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
  <!-- All elements from previous packages that will be included in the newly built package -->
  <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
- <HarvestIncludePaths Include="ref/netstandard1.3" />
- <HarvestIncludePaths Include="ref/netstandard1.4;runtimes/win/lib/netstandard1.4" />
+ <HarvestIncludePaths Include="ref/netstandard1.3;lib/netstandard1.3" />
+ <HarvestIncludePaths Include="ref/netstandard1.4;runtimes/win/lib/netstandard1.4;lib/netstandard1.4" />
  <HarvestIncludePaths Include="ref/netstandard1.6;runtimes/win/lib/netstandard1.6;lib/netstandard1.6" />
  <HarvestIncludePaths Include="ref/netcoreapp2.0;runtimes/win/lib/netcoreapp2.0" />
  <HarvestIncludePaths Include="ref/netcoreapp2.1;lib/netcoreapp2.1;runtimes/win/lib/netcoreapp2.1" />

diff --git a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
@@ -17,7 +17,7 @@
  <ItemGroup>
  <Compile Include="System.Security.Cryptography.Cng.cs" />
  </ItemGroup>
- <ItemGroup Condition="'$(TargetGroup)' != 'netstandard' AND '$(TargetGroup)' != 'netstandard1.3' AND '$(TargetGroup)' != 'netstandard1.4'">
+ <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
  <Compile Include="System.Security.Cryptography.Cng.ECDiffieHellman.cs" />
  </ItemGroup>
  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">

diff --git a/src/System.Security.Cryptography.Cng/src/Configurations.props b/src/System.Security.Cryptography.Cng/src/Configurations.props
@@ -3,8 +3,6 @@
  <PropertyGroup>
  <PackageConfigurations>
  netstandard;
- netstandard1.3;
- netstandard1.4;
  net461-Windows_NT;
  netcoreapp-Windows_NT;
  netcoreapp;

diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
@@ -8,12 +8,10 @@
  <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
  <ResourcesSourceOutputDirectory Condition="'$(IsPartialFacadeAssembly)' == 'true'">None</ResourcesSourceOutputDirectory>
  <GenFacadesIgnoreMissingTypes Condition="'$(TargetGroup)' == 'net461'">true</GenFacadesIgnoreMissingTypes>
- <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;net462-Windows_NT-Debug;net462-Windows_NT-Release;net47-Windows_NT-Debug;net47-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.3-Debug;netstandard1.3-Release;netstandard1.4-Debug;netstandard1.4-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release</Configurations>
+ <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;net462-Windows_NT-Debug;net462-Windows_NT-Release;net47-Windows_NT-Debug;net47-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release</Configurations>
  </PropertyGroup>
  <PropertyGroup Condition="'$(TargetsWindows)' != 'true'">
  <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyCng</GeneratePlatformNotSupportedAssemblyMessage>
- <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3'">4.0.0.0</AssemblyVersion>
- <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.4'">4.1.0.0</AssemblyVersion>
  <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard'">4.3.0.0</AssemblyVersion>
  </PropertyGroup>
  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetsWindows)' == 'true'">
@@ -353,10 +351,6 @@
  <Reference Include="mscorlib" />
  <Reference Include="System.Core" />
  </ItemGroup>
- <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3' OR '$(TargetGroup)' == 'netstandard1.4'">
- <Reference Include="System.IO" />
- <Reference Include="System.Runtime.Handles" />
- </ItemGroup>
  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
  <Reference Include="System.Buffers" />
  <Reference Include="System.Collections" />