Permalink
Browse files

Compile against netstandard2.0 instead of netcoreapp2.0 and netstanda…

…rd1.6 (#424)
  • Loading branch information...
bergmeister authored and alerickson committed Jan 21, 2019
1 parent b659d76 commit b87e2b9a0e24e8766f275d5bc54a70f248f2b4cd
@@ -1,6 +1,5 @@
version: 1.0.{build}
os:
- WMF 5
image: Visual Studio 2017
environment:
matrix:
- test_framework: fullclr
@@ -19,7 +18,7 @@ build_script:
- git submodule update --init
- ps: nuget locals all -clear
- ps: import-module c:\projects\oneget\test\TestUtility.psm1 -force
- ps: cd .\src; .\bootstrap.ps1; .\build.ps1 -framework "net452" Release -EmbedProviderManifest; .\build.ps1 -framework "netcoreapp2.0" Release -EmbedProviderManifest; .\build.ps1 -framework "netstandard1.6" Release -EmbedProviderManifest
- ps: cd .\src; .\bootstrap.ps1; .\build.ps1 -framework "net452" Release -EmbedProviderManifest; .\build.ps1 -framework "netstandard2.0" Release -EmbedProviderManifest

deploy_script:
- ps: |
@@ -202,8 +202,7 @@ git submodule update --init
> .\build.ps1 net452
#building OneGet for coreclr
> .\build.ps1 netstandard1.6
> .\build.ps1 netcoreapp2.0
> .\build.ps1 netstandard2.0
```

If successfully built above, you should be able to see a folder:
@@ -1,16 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.ArchiverProviders</AssemblyName>
<AssemblyOriginatorKeyFile>../signing/35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PackageId>Microsoft.PackageManagement.ArchiverProviders</PackageId>
<RuntimeIdentifiers>win7-x64;win81-x64;win10-x64</RuntimeIdentifiers>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -51,29 +49,13 @@
<Compile Remove="Resources\Messages.resx" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<DefineConstants>$(DefineConstants);CORECLR;COREv1</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>

<ItemGroup Condition=" ('$(TargetFramework)' == 'netcoreapp2.0') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<Compile Remove="Providers\Inbox\Common\*;Resources\*" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Update="Microsoft.NETCore.App" Version="2.0.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
</ItemGroup>

</Project>

This file was deleted.

Oops, something went wrong.
@@ -1,16 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.CoreProviders</AssemblyName>
<AssemblyOriginatorKeyFile>../signing/35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PackageId>Microsoft.PackageManagement.CoreProviders</PackageId>
<RuntimeIdentifiers>win7-x64;win81-x64;win10-x64</RuntimeIdentifiers>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -25,10 +23,7 @@
<ProjectReference Include="..\Microsoft.PackageManagement\Microsoft.PackageManagement.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Management.Automation" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard2.0') ">
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

@@ -58,30 +53,14 @@
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>$(DefineConstants);CORECLR;COREv1</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>

<ItemGroup Condition=" ('$(TargetFramework)' == 'netcoreapp2.0') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<Compile Remove="Resources\Messages.Designer.cs;ProgramsProvider.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Update="Microsoft.NETCore.App" Version="2.0.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
</ItemGroup>

</Project>

This file was deleted.

Oops, something went wrong.
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.MetaProvider.PowerShell</AssemblyName>
@@ -22,10 +22,7 @@
<ProjectReference Include="..\Microsoft.PackageManagement\Microsoft.PackageManagement.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Management.Automation" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard2.0') ">
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

@@ -55,30 +52,14 @@
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<DefineConstants>$(DefineConstants);CORECLR;COREv1</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>

<ItemGroup Condition=" ('$(TargetFramework)' == 'netcoreapp2.0') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Update="Microsoft.NETCore.App" Version="2.0.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
</ItemGroup>

</Project>
Oops, something went wrong.

0 comments on commit b87e2b9

Please sign in to comment.