fix build.cmd

microsoft · Sep 19, 2024 · e6c7bfb · e6c7bfb
1 parent 6ff9c76
commit e6c7bfb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -249,5 +249,4 @@ _site/
 /src/Application/Samples/rsspretty_output.htm
 /publish_appx
 /src/Application/Samples/rss.htm
-src/XmlNotepadSetup/build.cmd
 /src/Model/ApiKey.cs
diff --git a/build.cmd b/build.cmd
@@ -3,13 +3,15 @@
 nuget restore src\XmlNotepad.sln
 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\UpdateVersions\UpdateVersions.csproj /p:Configuration=Release "/p:Platform=AnyCPU"
 if ERRORLEVEL 1 goto :eof
 
 %~dp0\src\UpdateVersions\bin\Release\UpdateVersions.exe
 if ERRORLEVEL 1 goto :eof
 
-for %%i in (Release, Debug) do (     
+for %%i in (Release, Debug) do (
   msbuild /target:rebuild src\XmlNotepad.sln /p:Configuration=%%i "/p:Platform=Any CPU"
   if ERRORLEVEL 1 goto :eof
 )

diff --git a/publish.cmd b/publish.cmd
@@ -32,18 +32,9 @@ if EXIST "%ROOT%\publish" rd /s /q "%ROOT%\publish"
 if EXIST "%PUBLISH%" rd /s /q "%PUBLISH%"
 
 git clean -dfx
-nuget restore src\xmlnotepad.sln
-if ERRORLEVEL 1 goto :eof
 
-msbuild /target:rebuild src\UpdateVersions\UpdateVersions.csproj /p:Configuration=Release "/p:Platform=AnyCPU"
-if ERRORLEVEL 1 goto :eof
+call .\build.cmd
 
-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"
 if ERRORLEVEL 1 goto :nobits
 if not EXIST %PUBLISH%\XmlNotepad.application goto :nobits