From ee81ada15f281d67c7097ef81c7769a501cdbdf2 Mon Sep 17 00:00:00 2001
From: Chris Bacon <chrisbacon@google.com>
Date: Mon, 18 Jul 2016 15:01:22 +0100
Subject: [PATCH 1/2] Generated libraries target netstandard1.3

---
 .../___package_name___.csproj.tmpl            | 64 +++++++++++++++++++
 .../NetStandard/project.json.tmpl             | 14 ++++
 .../___package_name___.nuspec.tmpl            | 10 +++
 3 files changed, 88 insertions(+)
 create mode 100644 ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/___package_name___.csproj.tmpl
 create mode 100644 ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/project.json.tmpl

diff --git a/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/___package_name___.csproj.tmpl b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/___package_name___.csproj.tmpl
new file mode 100644
index 0000000000..95235a04f0
--- /dev/null
+++ b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/___package_name___.csproj.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.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>14.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E5F5E62A-616D-4F0D-8508-A76D7E760619}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>{{ api.module.name }}</RootNamespace>
+    <AssemblyName>{{ api.module.name }}</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <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'">
+    <OutputPath>bin\ReleaseSigned\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\{{ api.module.name }}.cs" />
+    <Compile Include="..\Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- 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>
\ No newline at end of file
diff --git a/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/project.json.tmpl b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/project.json.tmpl
new file mode 100644
index 0000000000..4a43d2a93c
--- /dev/null
+++ b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/NetStandard/project.json.tmpl
@@ -0,0 +1,14 @@
+{
+  "supports": {},
+  "dependencies": {
+    "Google.Apis": "{{ features.releaseVersion }}",
+    "Google.Apis.Core": "{{ features.releaseVersion }}",
+    "Newtonsoft.Json": "9.0.1",
+    "System.IO": "4.1.0",
+    "System.Runtime": "4.1.0",
+    "System.Threading.Tasks": "4.0.11"
+  },
+  "frameworks": {
+    "netstandard1.3": {}
+  }
+}
\ No newline at end of file
diff --git a/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl
index e71de6d75d..34c494471c 100644
--- a/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl
+++ b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl
@@ -16,6 +16,8 @@
 
           - .NET Framework 4 and 4.5
 
+          - NetStandard1.3
+
           - Windows Store apps
 
           - Windows Phone 8 and 8.1
@@ -30,6 +32,10 @@
         </description>
         <tags>Google</tags>
         <dependencies>
+            <group targetFramework="netstandard1.3">
+                <dependency id="Google.Apis" version="{{ features.releaseVersion }}" />{% if api.authscopes %}
+                <dependency id="Google.Apis.Auth" version="{{ features.releaseVersion }}" />{% endif %}
+            </group>
             <!--
               After v{{ features.oldCompatibleVersion }} of Google.Apis, we
               trimmed the list of supported target frameworks. For projects
@@ -48,6 +54,10 @@
         </dependencies>
     </metadata>
     <files>
+		<file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.dll" target="lib\netstandard1.3\{{ api.module.name }}.dll" />
+        <file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.pdb" target="lib\netstandard1.3\{{ api.module.name }}.pdb" />
+        <file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.xml" target="lib\netstandard1.3\{{ 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" />

From b76d2cafbb2dc8e7eb1236a7008ff1290280a18a Mon Sep 17 00:00:00 2001
From: Chris Bacon <chrisbacon@google.com>
Date: Mon, 18 Jul 2016 16:09:25 +0100
Subject: [PATCH 2/2] Fix indenting nit

---
 .../templates/___package_name___/___package_name___.nuspec.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl
index 34c494471c..e03b3960d9 100644
--- a/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl
+++ b/ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.nuspec.tmpl
@@ -54,7 +54,7 @@
         </dependencies>
     </metadata>
     <files>
-		<file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.dll" target="lib\netstandard1.3\{{ api.module.name }}.dll" />
+        <file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.dll" target="lib\netstandard1.3\{{ api.module.name }}.dll" />
         <file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.pdb" target="lib\netstandard1.3\{{ api.module.name }}.pdb" />
         <file src="NetStandard\bin\ReleaseSigned\{{ api.module.name }}.xml" target="lib\netstandard1.3\{{ api.module.name }}.xml" />