Move the google app analytics api key to an environment variable pick…

…ed up at build time.
microsoft · Oct 23, 2023 · 73651b4 · 73651b4
1 parent 53a1f53
commit 73651b4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -250,3 +250,4 @@ _site/
 /publish_appx
 /src/Application/Samples/rss.htm
 src/XmlNotepadSetup/build.cmd
+/src/Model/ApiKey.cs
diff --git a/publish.cmd b/publish.cmd
@@ -40,6 +40,7 @@ if ERRORLEVEL 1 goto :eof
 src\UpdateVersions\bin\Release\UpdateVersions.exe
 if ERRORLEVEL 1 goto :eof
 
+echo namespace XmlNotepad { public partial class AppAnalytics { private const string ApiKey="%XMLNOTEPAD_ANALYTICSKEY%"; } } > src\model\ApiKey.cs 
 msbuild /target:rebuild src\xmlnotepad.sln /p:Configuration=Release "/p:Platform=Any CPU"
 if ERRORLEVEL 1 goto :nobits
 msbuild /target:publish src\xmlnotepad.sln /p:Configuration=Release "/p:Platform=Any CPU"

diff --git a/src/Model/AppAnalytics.cs b/src/Model/AppAnalytics.cs
@@ -7,11 +7,10 @@
 
 namespace XmlNotepad
 {
-    public class AppAnalytics
+    public partial class AppAnalytics
     {
         private const string HostName = "microsoft.github.io";
         private const string TrackingId = "G-130J0SE94H";
-        private const string ApiKey = "DGyp7J4BQw-h8s-vlH_BDw";
         private string _clientId;
         private bool _formOptions; // did they use the options dialog during this session?
         private bool _formSchemas;

diff --git a/src/Model/Model.csproj b/src/Model/Model.csproj
@@ -36,4 +36,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="echo namespace XmlNotepad { public partial class AppAnalytics { private const string ApiKey=&quot;%25XMLNOTEPAD_ANALYTICSKEY%25&quot;; } } &gt; $(MSBuildThisFileDirectory)ApiKey.cs " />
+  </Target>
+
 </Project>
diff --git a/src/XmlNotepadBundle/Bundle.wxs b/src/XmlNotepadBundle/Bundle.wxs
@@ -6,10 +6,7 @@
     </BootstrapperApplicationRef>
     <Chain>
       <PackageGroupRef Id="NetFx48Web" />
-      <MsiPackage Id="XmlNotepad" 
-                  SourceFile="..\XmlNotepadSetup\bin\Release\XmlNotepadSetup.msi" 
-                  DisplayName="XML Notepad"
-                  EnableFeatureSelection="yes"/>
+      <MsiPackage Id="XmlNotepad" SourceFile="..\XmlNotepadSetup\bin\Release\XmlNotepadSetup.msi" DisplayName="XML Notepad" EnableFeatureSelection="yes" />
     </Chain>
   </Bundle>
 </Wix>