diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a67e529..d1522a0 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | + 3.1.x 6.0.x 7.0.x - name: Restore dependencies diff --git a/publish.cmd b/publish.cmd new file mode 100644 index 0000000..86ad3e5 --- /dev/null +++ b/publish.cmd @@ -0,0 +1,64 @@ +@echo off +SETLOCAL EnableDelayedExpansion +cd %~dp0 +SET ROOT=%~dp0 +set ZIPFILE=%ROOT%publish\XmlDiff.zip +for /f "usebackq" %%i in (%ROOT%src\Common\version.txt) do ( + set VERSION=%%i +) + +if "%VERSION%" == "" goto :noversion + +echo ### Publishing version %VERSION% ... +set GITRELEASE=1 + +:parse +if "%1"=="/norelease" set GITRELEASE=0 +if "%1"=="" goto :done +shift +goto :parse + +:done + +git clean -dfx +pwsh -f %ROOT%src\Common\fix_version.ps1 + +nuget restore src\XmlDiff.sln +if ERRORLEVEL 1 goto :norestore +msbuild /target:rebuild src\XmlDiff.sln /p:Configuration=Release "/p:Platform=Any CPU" +if ERRORLEVEL 1 goto :buildfailed + +pwsh -f %ROOT%src\Common\full_sign.ps1 +if ERRORLEVEL 1 goto :err_sign + +nuget pack src\XmlDiffView\XmlDiff.nuspec + +if exist publish rd /s /q publish +mkdir publish +pwsh -command "Compress-Archive -Path src\XmlDiffView\bin\Release\* -DestinationPath %ZIPFILE%" +if ERRORLEVEL 1 goto :err_compress + +if "%GITRELEASE%" == "0" goto :finished + +echo Creating new release for version %VERSION% +gh release create %VERSION% "LovettSoftware.XmlDiff.%VERSION%.nupkg" "%ZIPFILE%" --title "Xml Diff %VERSION%" + +:finished +call gitweb +goto :eof + +:norestore +echo Error restoring XmlDiff.sln +exit /b 1 + +:buildfailed +echo Error building XmlDiff.sln +exit /b 1 + +:err_sign +echo Signing failed, try building inside XmlNotepadSetup.sln +exit /b 1 + +:err_compress +echo Error creating zip file +exit /b 1 diff --git a/src/Common/version.props b/src/Common/version.props index 4b00586..e7b0daf 100644 --- a/src/Common/version.props +++ b/src/Common/version.props @@ -2,8 +2,8 @@ Lovett Software Copyright © Lovett Software - 1.0.6 - 1.0.6 - 1.0.6 + 1.0.7 + 1.0.7 + 1.0.7 \ No newline at end of file diff --git a/src/Common/version.txt b/src/Common/version.txt index 1464c52..f9cbc01 100644 --- a/src/Common/version.txt +++ b/src/Common/version.txt @@ -1 +1 @@ -1.0.5 \ No newline at end of file +1.0.7 \ No newline at end of file diff --git a/src/XmlDiffView/XmlDiff.nuspec b/src/XmlDiffView/XmlDiff.nuspec index 8a8e3ff..34ded33 100644 --- a/src/XmlDiffView/XmlDiff.nuspec +++ b/src/XmlDiffView/XmlDiff.nuspec @@ -2,7 +2,7 @@ LovettSoftware.XmlDiff - 1.0.6 + 1.0.7 Chris Lovett A library that compares and merges XML files. https://github.com/lovettchris/xmldiff diff --git a/src/t.htm b/src/t.htm deleted file mode 100644 index 573796e..0000000 --- a/src/t.htm +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - -
- -
- Legend: added   - removed   - changed   - moved   - ignored

-
- - -
C:\Users\clovett\AppData\Local\Temp\tmp39C.tmpC:\Users\clovett\AppData\Local\Temp\tmp39D.tmp
Files are different.
1<root><root>
<a /><a id="1"/>
<b><b>
 <temp/> 
1</b></b>
0 <c/>
1</root></root>