Merge branch 'release/v2.1.2005.3016'

.gitattributes

@@ -0,0 +1,139 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for COMMAND PROMPT diff (only).
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+#     *.cs    diff=csharp
+###############################################################################
+# Explicitly declare text files you want to always be normalized and converted
+# to _NATIVE_ line-endings on checkout.
+#     *.css    text
+###############################################################################
+# Explicitly declare files that will always have LF line endings on checkout.
+#     *.conf   text eol=lf
+###############################################################################
+
+
+###############################################################################
+# Force SYSTEM NATIVE line-endings. (ie: crlf on Windows, lf on Linux, etc.)
+###############################################################################
+
+# example
+#*.c      text
+
+###############################################################################
+# Force LF line-endings.
+###############################################################################
+# C/C++
+*.c      text eol=lf
+*.h      text eol=lf
+*.mk     text eol=lf
+
+# C#
+*.cs     text eol=lf diff=csharp
+
+# Web
+*.css    text eol=lf
+*.scss   text eol=lf
+*.js     text eol=lf
+*.htm    text eol=lf
+*.html   text eol=lf
+
+# Misc.
+*.txt    text eol=lf
+Makefile text eol=lf
+
+*.conf   text eol=lf
+*.config text eol=lf
+*.go     text eol=lf
+*.jinja  text eol=lf
+*.json   text eol=lf
+*.sh     text eol=lf
+*.sls    text eol=lf
+
+###############################################################################
+# Force CRLF line-endings.
+###############################################################################
+*.bat    eol=crlf
+*.BAT    eol=crlf
+*.cmd    eol=crlf
+*.CMD    eol=crlf
+
+###############################################################################
+# Behavior for common image file formats:
+#
+# Explicitly Denote all files that are truly binary and should not be modified.
+###############################################################################
+*.bmp    binary
+*.gif    binary
+*.jpg    binary
+*.png    binary
+*.tif    binary
+*.tiff   binary
+
+*.ai     binary
+*.pdn    binary
+*.psd    binary
+
+###############################################################################
+# Behavior for common document formats:
+#
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line.
+###############################################################################
+*.doc      diff=astextplain
+*.DOC      diff=astextplain
+*.docx     diff=astextplain
+*.DOCX     diff=astextplain
+*.dot      diff=astextplain
+*.DOT      diff=astextplain
+*.pdf      diff=astextplain
+*.PDF      diff=astextplain
+*.rtf      diff=astextplain
+*.RTF      diff=astextplain
+
+*.md       diff=astextplain
+*.MD       diff=astextplain
+*.markdown diff=astextplain
+*.Markdown diff=astextplain
+
+
+###############################################################################
+# Set the merge driver for Visual Studio project and solution files:
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln        merge=binary
+#*.csproj     merge=binary
+#*.vbproj     merge=binary
+#*.vcxproj    merge=binary
+#*.vcproj     merge=binary
+#*.dbproj     merge=binary
+#*.fsproj     merge=binary
+#*.lsproj     merge=binary
+#*.wixproj    merge=binary
+#*.modelproj  merge=binary
+#*.sqlproj    merge=binary
+#*.wwaproj    merge=binary
+*.sln        text eol=lf
+*.csproj     text eol=lf
+*.vbproj     text eol=lf
+*.vcxproj    text eol=lf
+*.vcproj     text eol=lf
+*.dbproj     text eol=lf
+*.fsproj     text eol=lf
+*.lsproj     text eol=lf
+*.wixproj    text eol=lf
+*.modelproj  text eol=lf
+*.sqlproj    text eol=lf
+*.wwaproj    text eol=lf

.github/workflows/dotnet-core-build.yml

@@ -0,0 +1,46 @@
+name: dotnet-core-build
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # dotnet: [ '2.2.x', '3.0.x', '3.1.x' ]
+        dotnet: [ '3.1.202' ]
+    name: dotnet core ${{ matrix.dotnet }}
+    steps:
+      - name: Get variables
+        run: |
+          echo ::set-env name=APP_NAME::sortxml
+          echo APP_NAME=${{ env.APP_NAME }}
+          echo ::set-env name=TAG_NAME::${GITHUB_REF#refs/*/}
+          echo TAG_NAME=${{ env.TAG_NAME }}
+
+      - name: Get source
+        uses: actions/checkout@v2
+          # ref: ${github.ref##*/}
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v1.4.0
+        with:
+          dotnet-version: ${{ matrix.dotnet }}
+
+      - name: Restore
+        run: dotnet restore
+
+      - name: Format
+        run: |
+          dotnet tool install -g dotnet-format
+          dotnet format -v d -w ${{ env.APP_NAME }}.csproj
+
+      - name: Build
+        run: dotnet build --configuration Release
+
+      - name: Test
+        run: dotnet test --verbosity normal

.github/workflows/dotnet-core-release.yml

@@ -0,0 +1,161 @@
+name: dotnet-core-release
+
+on:
+  push:
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # dotnet: [ '2.2.x', '3.0.x', '3.1.x' ]
+        dotnet: [ '3.1.202' ]
+    name: dotnet core ${{ matrix.dotnet }}
+    steps:
+      - name: Get variables
+        run: |
+          echo ::set-env name=APP_NAME::sortxml
+          echo ::set-env name=TAG_NAME::${GITHUB_REF#refs/*/}
+
+      - name: Get source
+        uses: actions/checkout@master
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v1.4.0
+        with:
+          dotnet-version: ${{ matrix.dotnet }}
+
+      # - name: Restore
+      #   run: dotnet restore
+
+      # - name: Build
+      #   run: dotnet build --no-restore --configuration Release
+
+      - name: Test
+        run: dotnet test --verbosity normal
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ env.TAG_NAME }}
+          draft: false
+          prerelease: false
+
+      - name: "Publish: win-x64"
+        run: |
+          dotnet restore --runtime win-x64
+          dotnet publish --nologo --configuration Release --runtime win-x64 --framework netcoreapp3.1 --output ./win-x64/ --self-contained false
+          zip --junk-paths ./${{ env.APP_NAME }}-win-x64-${{ env.TAG_NAME }}.zip ./win-x64/*
+
+      - name: "Upload: win-x64"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.APP_NAME }}-win-x64-${{ env.TAG_NAME }}.zip
+          asset_name: ${{ env.APP_NAME }}-win-x64-${{ env.TAG_NAME }}.zip
+          asset_content_type: application/zip
+
+      - name: "Publish: win-x86"
+        run: |
+          dotnet restore --runtime win-x86
+          dotnet publish --nologo --configuration Release --runtime win-x86 --framework netcoreapp3.1 --output ./win-x86/ --self-contained false
+          zip -o -7 --junk-paths ./${{ env.APP_NAME }}-win-x86-${{ env.TAG_NAME }}.zip ./win-x86/*
+
+      - name: "Upload: win-x86"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.APP_NAME }}-win-x86-${{ env.TAG_NAME }}.zip
+          asset_name: ${{ env.APP_NAME }}-win-x86-${{ env.TAG_NAME }}.zip
+          asset_content_type: application/zip
+
+      - name: "Publish: win-arm"
+        run: |
+          dotnet restore --runtime win-arm
+          dotnet publish --nologo --configuration Release --runtime win-arm --framework netcoreapp3.1 --output ./win-arm/ --self-contained false
+          zip -o -7 --junk-paths ./${{ env.APP_NAME }}-win-arm-${{ env.TAG_NAME }}.zip ./win-arm/*
+
+      - name: "Upload: win-arm"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.APP_NAME }}-win-arm-${{ env.TAG_NAME }}.zip
+          asset_name: ${{ env.APP_NAME }}-win-arm-${{ env.TAG_NAME }}.zip
+          asset_content_type: application/zip
+
+      # - name: "Publish: win-x64-self-contained"
+      #   run: |
+      #     dotnet restore
+      #     dotnet publish --nologo --configuration Release --runtime win-x64 --framework netcoreapp3.1 --output ./win-x64-self-contained/ --self-contained true
+      #     zip --junk-paths ./${{ env.APP_NAME }}-win-x64-self-contained-${{ env.TAG_NAME }}.zip ./win-x64-self-contained/*
+
+      # - name: "Upload: win-x64-self-contained"
+      #   uses: actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #     asset_path: ./${{ env.APP_NAME }}-win-x64-self-contained-${{ env.TAG_NAME }}.zip
+      #     asset_name: ${{ env.APP_NAME }}-win-x64-self-contained-${{ env.TAG_NAME }}.zip
+      #     asset_content_type: application/zip
+
+      - name: "Publish: linux-x64"
+        run: |
+          dotnet restore --runtime linux-x64
+          dotnet publish --nologo --configuration Release --runtime linux-x64 --framework netcoreapp3.1 --output ./publish/linux-x64/ --self-contained false
+          zip -o -7 --junk-paths ./${{ env.APP_NAME }}-linux-x64-${{ env.TAG_NAME }}.zip ./publish/linux-x64/*
+
+      - name: "Upload: linux-x64"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.APP_NAME }}-linux-x64-${{ env.TAG_NAME }}.zip
+          asset_name: ${{ env.APP_NAME }}-linux-x64-${{ env.TAG_NAME }}.zip
+          asset_content_type: application/zip
+
+      - name: "Publish: linux-arm"
+        run: |
+          dotnet restore --runtime linux-arm
+          dotnet publish --nologo --configuration Release --runtime linux-arm --framework netcoreapp3.1 --output ./publish/linux-arm/ --self-contained false
+          zip -o -7 --junk-paths ./${{ env.APP_NAME }}-linux-arm-${{ env.TAG_NAME }}.zip ./publish/linux-arm/*
+
+      - name: "Upload: linux-arm"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.APP_NAME }}-linux-arm-${{ env.TAG_NAME }}.zip
+          asset_name: ${{ env.APP_NAME }}-linux-arm-${{ env.TAG_NAME }}.zip
+          asset_content_type: application/zip
+
+      - name: "Publish: osx-x64"
+        run: |
+          dotnet restore --runtime osx-x64
+          dotnet publish --nologo --configuration Release --runtime osx-x64 --framework netcoreapp3.1 --output ./publish/osx-x64/ --self-contained false
+          zip -o -7 --junk-paths ./${{ env.APP_NAME }}-osx-x64-${{ env.TAG_NAME }}.zip ./publish/osx-x64/*
+
+      - name: "Upload: osx-x64"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.APP_NAME }}-osx-x64-${{ env.TAG_NAME }}.zip
+          asset_name: ${{ env.APP_NAME }}-osx-x64-${{ env.TAG_NAME }}.zip
+          asset_content_type: application/zip