Skip to content

Commit

Permalink
GoogleWebAuthorizationBroker and FileDataStore on NetStandard (#962)
Browse files Browse the repository at this point in the history
Fixes #897
  • Loading branch information
chrisdunelm authored Mar 30, 2017
1 parent 821c52f commit 12dbe82
Show file tree
Hide file tree
Showing 22 changed files with 987 additions and 308 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="OAuth2\GoogleWebAuthorizationBroker.cs" />
<Compile Include="OAuth2\LocalServerCodeReceiver.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
Expand All @@ -91,6 +89,9 @@
<Name>GoogleApis.PlatformServices_Net45</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="OAuth2\" />
</ItemGroup>
<Import Project="..\GoogleApis.Auth.PlatformServices_Shared\GoogleApis.Auth.PlatformServices_Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
136 changes: 0 additions & 136 deletions Src/Support/GoogleApis.Auth.DotNet4/OAuth2/LocalServerCodeReceiver.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ limitations under the License.
"d8c1c0071dd36748297deefeb99e899e6a80b9ddc490e88ea566d2f7d4f442211f7beb6b2387fb" +
"435bfaa3ecfe7afc0184cc46f80a5866e6bb8eb73f64a3964ed82f6a5036b91b1ac93e1f44508b" +
"65e51fce")]
[assembly: InternalsVisibleTo("Google.Apis.Auth.Tests,PublicKey=" +
"00240000048000009400000006020000002400005253413100040000010001003d69fa08add2ea" +
"7341cc102edb2f3a59bb49e7f7c8bf1bd96d494013c194f4d80ee30278f20e08a0b7cb863d6522" +
"d8c1c0071dd36748297deefeb99e899e6a80b9ddc490e88ea566d2f7d4f442211f7beb6b2387fb" +
"435bfaa3ecfe7afc0184cc46f80a5866e6bb8eb73f64a3964ed82f6a5036b91b1ac93e1f44508b" +
"65e51fce")]
#else
[assembly: InternalsVisibleTo("Google.Apis.Auth.DotNet4.Tests")]
[assembly: InternalsVisibleTo("Google.Apis.Auth.Tests")]
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
<Project>{a6df7ada-7d48-4715-9c94-70dcbc07ea37}</Project>
<Name>GoogleApis.Core_NetStandard</Name>
</ProjectReference>
<ProjectReference Include="..\GoogleApis\NetStandard\GoogleApis_NetStandard.csproj">
<Project>{453c7ff3-a3eb-4968-998f-9770d6c4e7b8}</Project>
<Name>GoogleApis_NetStandard</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="OAuth2\" />
Expand Down
3 changes: 2 additions & 1 deletion Src/Support/GoogleApis.Auth.NetStandard/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"supports": {},
"dependencies": {
"NETStandard.Library": "1.6.1",
"System.Net.Requests": "4.3.0"
"System.Net.Requests": "4.3.0",
"System.Diagnostics.Process": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\DefaultCredentialProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\GoogleCredential.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\GoogleWebAuthorizationBroker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\LocalServerCodeReceiver.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\Pkcs8.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\PromptCodeReceiver.cs" />
<Compile Include="$(MSBuildThisFileDirectory)OAuth2\ServiceAccountCredential.cs" />
Expand Down
Loading

0 comments on commit 12dbe82

Please sign in to comment.