Merge pull request #482 from github/fixes/client-id

Remove dependency on private script submodule

Author: jcansdale

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "submodules/akavache"]
 	path = submodules/akavache
 	url = https://github.com/editor-tools/Akavache
-[submodule "script"]
-	path = script
-	url = [email protected]:github/VisualStudioBuildScripts
 [submodule "submodules/octokit.graphql.net"]
 	path = submodules/octokit.graphql.net
 	url = https://github.com/octokit/octokit.graphql.net

Key.snk

@@ -13,14 +13,8 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
-- task: InstallSSHKey@0
-  inputs:
-    hostName: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-    sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx/AxLjr4mhH7XFlbISb65GBxQnVnKh1owmAT1bK/Qt1b4/Z0SL68IvV88DpgLyKbica2giEVfKo/Z4dkO+P8M2bGXrNgazzfO910DlR+e1vt8BSU/Dbvscz0i1lsfKb3PnfSouCkQev6Th0v+hBdgkuackWgaBw22DDLkp9Uf/cAo+QYLz56p5KVctEESRRgGgIIlZyUc8OYDMSU2wQhG9x31mSyJ4ODuOZsi1RgBBHrgUb2QRhLJ9nZWfQgGBRDxGYTKLWiWIQwgSVQ9x1Az/Rei+CbPRvLcVGg+5vHt8lcu+HxEgrY4IsjXdMqosPqxQ+TT6f+G4GQDn8+IQ4wOpTVi84PkOQX3JPE2QSJwWA0AHNe5NTSns6WWYQyzxFJYBN2pLPuMnj9/+ozV3GaeQqn47WHfUH3s5IawNQPTFDxcl4qsmU66Ybfqa4eFIPEvCCp1leQcuXyDHxKLq80x1szN4kn0oyL2W0zbkwTaZG4I5l4Rto0hErUf3qx7FlZjMGEFMdJVskgnRMkKdqngF0FmSYQICpmqqYD8TydUc6jxZVOCvFF5gbqwxV/F2lk10D7FnetUNeWvpcZKbFUX4e5Ff15vibJZp4/5FUbksv+glfbPwk6tGuNj3xPFODP7KG8Y5wtcbknX11XI0vi+iL8TxL0Vk30TpZUMXWYYvQ==
-    sshKeySecureFile: id_rsa
-
-- script: git submodule init && git submodule deinit script && git submodule update
-  displayName: Submodule init
+- checkout: self
+  submodules: true
 
 # Can't use the NuGet tasks because of https://github.com/Microsoft/azure-pipelines-tasks/issues/6790
 #- task: NuGetToolInstaller@0
@@ -54,7 +48,7 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     msbuildVersion: '16.0'
-    msbuildArguments: '/property:DeployExtension=False'
+    msbuildArguments: '/property:DeployExtension=False;GitHubVS_ClientId=$(GitHubVS_ClientId);GitHubVS_ClientSecret=$(GitHubVS_ClientSecret)'
 
 - task: MSBuild@1
   displayName: GitHub Essentials

azure-pipelines.yml

@@ -7,13 +7,34 @@
 
   <Import Project="$(SolutionDir)\src\common\signing.props" />
 
-  <ItemGroup Condition="$(Buildtype) == 'Internal'">
-    <Compile Remove="ApiClientConfiguration_User.cs" />
-    <Compile Include="..\..\script\src\ApiClientConfiguration_User.cs">
-      <Link>ApiClientConfiguration_User.cs</Link>
-    </Compile>
-  </ItemGroup>
-
+  <Target Name="AddClientSecret" BeforeTargets="BeforeCompile"
+          Inputs="$(MSBuildThisFileFullPath)" Outputs="$(IntermediateOutputPath)ApiClientConfiguration.$(GitHubVS_ClientId).cs">
+    <Error Condition="'$(GitHubVS_ClientId)' == '' OR '$(GitHubVS_ClientSecret)' == ''"
+          Text="Please define 'GitHubVS_ClientId' and 'GitHubVS_ClientSecret' environment variables (restart Visual Studio if necessary)" />
+    <PropertyGroup>
+      <GeneratedFilePath>$(IntermediateOutputPath)ApiClientConfiguration.$(GitHubVS_ClientId).cs</GeneratedFilePath>
+      <GeneratedText>
+        <![CDATA[
+namespace GitHub.Api
+{
+  static partial class ApiClientConfiguration
+  {
+    static partial void Configure()
+    {
+      ClientId = "$(GitHubVS_ClientId)"%3b
+      ClientSecret = "$(GitHubVS_ClientSecret)"%3b
+    }
+  }
+}
+]]>
+      </GeneratedText>
+    </PropertyGroup>
+    <ItemGroup>
+      <Compile Include="$(GeneratedFilePath)" />
+    </ItemGroup>
+    <WriteLinesToFile File="$(GeneratedFilePath)" Lines="$(GeneratedText)" WriteOnlyWhenDifferent="true" Overwrite="true" />
+  </Target>
+  
   <ItemGroup>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Net.Http" />

script

@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <BuildType Condition="Exists('..\..\script\key.snk')">Internal</BuildType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(BuildType)' == 'Internal'">
-    <AssemblyOriginatorKeyFile>..\..\script\key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(BuildType)' != 'Internal' and Exists('..\..\signingkey')">
-    <AssemblyOriginatorKeyFile>..\..\signingkey.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\script\key.snk" Condition="'$(BuildType)' == 'Internal'">
+    <None Include="..\..\key.snk">
       <Link>key.snk</Link>
     </None>
-
-    <None Include="..\..\signingkey" Condition="'$(BuildType)' != 'Internal' and Exists('..\..\signingkey')">
-      <Link>signingkey</Link>
-    </None>
   </ItemGroup>
 </Project>