Move to VS2017/csproj #977

chrisdunelm · 2017-04-21T15:37:19Z

Remove support for legacy targets. Now only targets net45 and netstandard1.3

Project structure simplified.

Fixes #558, #978, #979.

Remove support for legacy targets. Now only targets net45 and netstandard1.3 Project structure simplified

chrisdunelm · 2017-04-21T15:40:31Z

Tests are currently expected to fail. CI scripts have not yet been updated.

jskeet · 2017-04-21T16:22:09Z

Thanks, I think... will need to look very carefully, starting Monday.

What does the removal of the legacy targets mean? Is the plan to simply make the API-specific client libraries depend on older versions, like we did for Silverlight?

Any suggestions around how to review this would be welcome too, btw...

chrisdunelm · 2017-04-21T16:33:19Z

Yes, the plan for the generated libraries is to make the legacy targets depend on older support library versions (i.e. probably the current release v1.25.0).

If you specifically could check that the new project structure looks suitable; and that I haven't missed any code! And that the csproj files look sane, containing all the right information for building and nuget packing.

Thanks (and apologies)

chrisdunelm · 2017-04-21T16:33:58Z

And note that this is not going into master; and there will be quite a few follow-up PRs into this VS2017 branch before it'll be ready to merge into master.

chrisdunelm · 2017-04-23T20:59:00Z

Should have added, all unit tests pass when run locally

chrisdunelm · 2017-04-24T15:17:59Z

@jskeet Directories re-layed-out. PTAL

jskeet

Some preliminary comments; I suspect they may apply to multiple files. I'll research whether Release implicitly optimizes.

...s.Auth.Tests/Google.Apis.Auth.Tests.OAuth2.Requests/GoogleAuthorizationCodeRequestUrlTest.cs

-        }
-    }
-}
+/*


Src/Support/Google.Apis.Auth.Tests/Google.Apis.Auth.Tests.csproj

+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.3.0-*" />
+    <PackageReference Include="Xunit.Combinatorial" Version="1.2.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-*" />


Src/Support/Google.Apis.Auth.Tests/Google.Apis.Auth.Tests.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>


Src/Support/Google.Apis.Auth.Tests/Google.Apis.Auth.Tests.csproj

+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <!-- net452 is the earliest desktop version supported by xunit runner -->
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>


Src/Support/Google.Apis.Auth.Tests/Google.Apis.Auth.Tests.csproj

+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+  <PropertyGroup>


Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+    <Title>Google APIs Client Library</Title>
+    <PackageTags>Google</PackageTags>
+    <Description>
+The Google APIs Client Library is a runtime client for working with Google services.


Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
+  </ItemGroup>
+
+  <!-- configurations; common then per-configuration -->


Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">


Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+
+  <!-- build and include the (empty) platformservices dll in package; required for backward compatibility -->
+  <!-- There must be a better way of doing this... -->
+  <Target Name="IncludePlatformServices" BeforeTargets="GenerateNuspec">


jskeet · 2017-04-25T09:49:57Z

I do like the idea of keeping all the packaging information separate from build information, btw. Will do that too...

chrisdunelm · 2017-04-25T10:31:29Z

Thanks, PTAL

Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!-- nupkg information -->
+  <Import Project="..\CommonPackageInfo.xml" />


Src/Support/CommonPackageInfo.xml

+	<Copyright>Copyright 2017 Google Inc.</Copyright>
+	<PackageProjectUrl>https://developers.google.com/api-client-library/dotnet</PackageProjectUrl>
+	<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>


Src/Support/CommonPackageInfo.xml

+  <PropertyGroup>
+    <PackageVersion>1.25.0</PackageVersion>
+	<Authors>Google Inc.</Authors>
+	<Copyright>Copyright 2017 Google Inc.</Copyright>


Src/Support/CommonPackageInfo.xml

+	<PackageProjectUrl>https://developers.google.com/api-client-library/dotnet</PackageProjectUrl>
+	<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+	<RepositoryType>git</RepositoryType>


Src/Support/CommonPackageInfo.xml

+<Project>
+  <PropertyGroup>
+    <PackageVersion>1.25.0</PackageVersion>
+	<Authors>Google Inc.</Authors>


Src/Support/CommonPackageInfo.xml

+	<PackageProjectUrl>https://developers.google.com/api-client-library/dotnet</PackageProjectUrl>
+	<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+	<RepositoryType>git</RepositoryType>


jskeet

Next round :) I think we can extract a lot of the packaging commonality.

Src/Support/Google.Apis.Auth.Tests/Google.Apis.Auth.Tests.csproj

+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.3.0-*" />
+    <PackageReference Include="Xunit.Combinatorial" Version="1.2.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-*" />


Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">


Src/Support/Google.Apis.Core/Google.Apis.Core.csproj

+    <DebugType>pdbonly</DebugType>
+    <IncludeSymbols>true</IncludeSymbols>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DocumentationFile>Google.Apis.Core.xml</DocumentationFile>


Src/Support/Google.Apis.Core/Google.Apis.Core.csproj

+  <!-- configurations; common -->
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <SignAssembly>true</SignAssembly>


Src/Support/Google.Apis.Core/Google.Apis.Core.csproj

+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../../google.apis.snk</AssemblyOriginatorKeyFile>
+    <DebugType>pdbonly</DebugType>
+    <IncludeSymbols>true</IncludeSymbols>


Src/Support/Google.Apis.Tests/Google.Apis.Tests.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>


Src/Support/Google.Apis/Google.Apis.csproj

+  <ItemGroup>
+    <None Include="$(OutputPath)net45\Google.Apis.PlatformServices.dll">
+      <Pack>true</Pack>
+	    <PackagePath>lib\net45</PackagePath>


Src/Support/Google.Apis.Auth/Google.Apis.Auth.csproj

+    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\google.apis.snk</AssemblyOriginatorKeyFile>
+    <DebugType>pdbonly</DebugType>


chrisdunelm · 2017-04-25T16:55:34Z

All done. PTAL

chrisdunelm · 2017-04-26T08:00:13Z

Merging after offline LGTM

Move to VS2017/csproj

0f76f61

Remove support for legacy targets. Now only targets net45 and netstandard1.3 Project structure simplified

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 21, 2017

chrisdunelm assigned jskeet Apr 21, 2017

This was referenced Apr 24, 2017

Support for Id_token validataion. #920

Closed

Slow upload tests on .NET Core #800

Closed

Relayout directories

b1c79bd

jskeet reviewed Apr 25, 2017

View reviewed changes

Address review comments

b23c81b

jskeet reviewed Apr 25, 2017

View reviewed changes

chrisdunelm added 2 commits April 25, 2017 10:36

Add missing file

8a8092f

Fix tabbing

87afbca

jskeet reviewed Apr 25, 2017

View reviewed changes

Address review comments

7f572c0

jskeet reviewed Apr 25, 2017

View reviewed changes

Next round of review addressed

dc24a52

chrisdunelm merged commit 994f69d into googleapis:vs2017 Apr 26, 2017

chrisdunelm deleted the restructure branch April 26, 2017 08:00

		@@ -0,0 +1,29 @@
		<Project Sdk="Microsoft.NET.Sdk">

		<PropertyGroup>

Move to VS2017/csproj #977

Move to VS2017/csproj #977

Conversation

chrisdunelm commented Apr 21, 2017 • edited

chrisdunelm commented Apr 21, 2017

jskeet commented Apr 21, 2017

chrisdunelm commented Apr 21, 2017

chrisdunelm commented Apr 21, 2017

chrisdunelm commented Apr 23, 2017

chrisdunelm commented Apr 24, 2017

jskeet left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

jskeet commented Apr 25, 2017

chrisdunelm commented Apr 25, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

jskeet left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

chrisdunelm commented Apr 25, 2017

chrisdunelm commented Apr 26, 2017

chrisdunelm commented Apr 21, 2017 •

edited