Skip to content

Commit

Permalink
Merge pull request #718 from mmdriley/dotnet4-lite
Browse files Browse the repository at this point in the history
Create v1.12 of generated libraries, with two PCL profiles
  • Loading branch information
mmdriley committed Apr 4, 2016
2 parents 466a97e + 8c59bb1 commit 384a927
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 41 deletions.
Expand Up @@ -2,5 +2,6 @@
"language": "csharp",
"description": "C# libraries for Google APIs.",
"releaseVersion": "1.11.1",
"nugetVersion": "1.11.1"
"nugetVersion": "1.12.0",
"oldCompatibleVersion": "1.10.0"
}
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
<PropertyGroup>
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6745AAF1-A1B5-4C28-8B33-195FA88BCDAF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>{{ api.module.name }}</RootNamespace>
<AssemblyName>{{ api.module.name }}</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<DocumentationFile>{{ api.module.name }}.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseSigned|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\ReleaseSigned\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\..\google.apis.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\{{ api.module.name }}.cs"/>
<Compile Include="..\Properties\AssemblyInfo.cs"/>
</ItemGroup>
<ItemGroup>
<Reference Include="Google.Apis.Core">
<HintPath>..\..\packages\Google.Apis.Core.{{ features.releaseVersion }}\lib\portable-net45+sl50+netcore45+wpa81+wp8\Google.Apis.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Google.Apis">
<HintPath>..\..\packages\Google.Apis.{{ features.releaseVersion }}\lib\portable-net45+sl50+netcore45+wpa81+wp8\Google.Apis.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Zlib.Portable">
<HintPath>..\..\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Google.Apis" version="{{ features.releaseVersion }}" targetFramework="portable-net40+sl50+win+wpa81+wp80"/>
<package id="Google.Apis.Core" version="{{ features.releaseVersion }}" targetFramework="portable-net40+sl50+win+wpa81+wp80"/>
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable-net40+sl50+win+wpa81+wp80" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net40+sl50+win+wpa81+wp80" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable-net40+sl50+win+wpa81+wp80" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable-net40+sl50+win+wpa81+wp80" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable-net40+sl50+win+wpa81+wp80" />
<package id="Zlib.Portable.Signed" version="1.11.0" targetFramework="portable-net40+sl50+win+wpa81+wp80" />
<package id="Google.Apis" version="{{ features.releaseVersion }}" targetFramework="portable45-net45+win8+wp8+wpa81"/>
<package id="Google.Apis.Core" version="{{ features.releaseVersion }}" targetFramework="portable45-net45+win8+wp8+wpa81"/>
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Zlib.Portable.Signed" version="1.11.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages>
Expand Up @@ -11,7 +11,7 @@
<RootNamespace>{{ api.module.name }}</RootNamespace>
<AssemblyName>{{ api.module.name }}</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile344</TargetFrameworkProfile>
<TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<DocumentationFile>{{ api.module.name }}.xml</DocumentationFile>
Expand Down Expand Up @@ -41,60 +41,69 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\google.apis.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\..\google.apis.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="{{ api.module.name }}.cs"/>
<Compile Include="Properties\AssemblyInfo.cs"/>
<Compile Include="..\{{ api.module.name }}.cs"/>
<Compile Include="..\Properties\AssemblyInfo.cs"/>
</ItemGroup>
<ItemGroup>
<Reference Include="Google.Apis.Core">
<HintPath>..\packages\Google.Apis.Core.{{ features.releaseVersion }}\lib\portable-net45+sl50+netcore45+wpa81+wp8\Google.Apis.Core.dll</HintPath>
<HintPath>..\..\packages\Google.Apis.Core.{{ features.oldCompatibleVersion }}\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Google.Apis">
<HintPath>..\packages\Google.Apis.{{ features.releaseVersion }}\lib\portable-net45+sl50+netcore45+wpa81+wp8\Google.Apis.dll</HintPath>
<HintPath>..\..\packages\Google.Apis.{{ features.oldCompatibleVersion }}\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.IO">
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Runtime">
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Zlib.Portable">
<HintPath>..\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
<HintPath>..\..\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config"/>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Google.Apis" version="{{ features.oldCompatibleVersion }}" targetFramework="portable40-net40+sl5+win8+wp8+wpa81"/>
<package id="Google.Apis.Core" version="{{ features.oldCompatibleVersion }}" targetFramework="portable40-net40+sl5+win8+wp8+wpa81"/>
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable40-net40+sl5+win8+wp8+wpa81" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable40-net40+sl5+win8+wp8+wpa81" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable40-net40+sl5+win8+wp8+wpa81" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable40-net40+sl5+win8+wp8+wpa81" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable40-net40+sl5+win8+wp8+wpa81" />
<package id="Zlib.Portable.Signed" version="1.11.0" targetFramework="portable40-net40+sl5+win8+wp8+wpa81" />
</packages>
Expand Up @@ -14,7 +14,7 @@
Google APIs Client Library for working with {% camel_case api.name %} {{ api.version }}.
Supported Platforms:

- .NET Framework 4.5
- .NET Framework 4 and 4.5

- Windows Store apps

Expand All @@ -30,15 +30,30 @@
</description>
<tags>Google</tags>
<dependencies>
<group>
<!--
After v{{ features.oldCompatibleVersion }} of Google.Apis, we
trimmed the list of supported target frameworks. For projects
still targeting e.g. .NET 4.0 we add a reference to an older
version of Google.Apis.
-->
<group targetFramework="portable-net45+netcore45+wpa81+wp8">
<dependency id="Google.Apis" version="{{ features.releaseVersion }}" />{% if api.authscopes %}
<dependency id="Google.Apis.Auth" version="{{ features.releaseVersion }}" />{% endif %}
</group>
<group targetFramework="portable-net40+sl50+netcore45+wpa81+wp8">
<!-- Use [version] to require exact match. -->
<dependency id="Google.Apis" version="[{{ features.oldCompatibleVersion }}]" />{% if api.authscopes %}
<dependency id="Google.Apis.Auth" version="[{{ features.oldCompatibleVersion }}]" />{% endif %}
</group>
</dependencies>
</metadata>
<files>
<file src="bin\ReleaseSigned\{{ api.module.name }}.dll" target="lib\portable-net45+sl50+netcore45+wpa81+wp8\{{ api.module.name }}.dll" />
<file src="bin\ReleaseSigned\{{ api.module.name }}.pdb" target="lib\portable-net45+sl50+netcore45+wpa81+wp8\{{ api.module.name }}.pdb" />
<file src="bin\ReleaseSigned\{{ api.module.name }}.xml" target="lib\portable-net45+sl50+netcore45+wpa81+wp8\{{ api.module.name }}.xml" />
<file src="Profile259\bin\ReleaseSigned\{{ api.module.name }}.dll" target="lib\portable-net45+netcore45+wpa81+wp8\{{ api.module.name }}.dll" />
<file src="Profile259\bin\ReleaseSigned\{{ api.module.name }}.pdb" target="lib\portable-net45+netcore45+wpa81+wp8\{{ api.module.name }}.pdb" />
<file src="Profile259\bin\ReleaseSigned\{{ api.module.name }}.xml" target="lib\portable-net45+netcore45+wpa81+wp8\{{ api.module.name }}.xml" />

<file src="Profile328\bin\ReleaseSigned\{{ api.module.name }}.dll" target="lib\portable-net40+sl50+netcore45+wpa81+wp8\{{ api.module.name }}.dll" />
<file src="Profile328\bin\ReleaseSigned\{{ api.module.name }}.pdb" target="lib\portable-net40+sl50+netcore45+wpa81+wp8\{{ api.module.name }}.pdb" />
<file src="Profile328\bin\ReleaseSigned\{{ api.module.name }}.xml" target="lib\portable-net40+sl50+netcore45+wpa81+wp8\{{ api.module.name }}.xml" />
</files>
</package>

0 comments on commit 384a927

Please sign in to comment.