From fc1685159a948ea7ae6e45412d15e27b9597ae34 Mon Sep 17 00:00:00 2001 From: Kevin Bost Date: Wed, 7 Apr 2021 14:56:12 -0700 Subject: [PATCH 1/4] Attempting rev to net5 --- .../workflows/ConvertGuidelinesXmlToMarkdown.yml | 2 +- .github/workflows/manuallyRunXmlToMD.yml | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml b/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml index bcd87ac3..a672b99b 100644 --- a/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml +++ b/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml @@ -36,7 +36,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.301 + dotnet-version: 5.0.201 if: ${{ steps.diff.outputs.modified == 'true' }} - name: restore_compile_run_createMD diff --git a/.github/workflows/manuallyRunXmlToMD.yml b/.github/workflows/manuallyRunXmlToMD.yml index cc7b93e2..07aa10ba 100644 --- a/.github/workflows/manuallyRunXmlToMD.yml +++ b/.github/workflows/manuallyRunXmlToMD.yml @@ -23,20 +23,16 @@ jobs: with: ref: ${{ github.ref }} token: ${{ secrets.CI_PAT }} - - - + - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.301 - + dotnet-version: 5.0.201 - name: restore_compile_run_createMD run: | dotnet run --configuration Release --project ./XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj - ./XMLtoMD/GuidelineXmlToMD/bin/Release/netcoreapp3.1/GuidelineXmlToMD "${{ env.XmlFileName }}" - + -- --xml-input-file "./docs/${{ env.XmlFileName }}" --markdown-output-file "./docs/coding/csharp.md" - name: Create commit and push to CodingGuideLinesMDUpdate run: | @@ -44,5 +40,4 @@ jobs: git config user.email '${{ github.actor }}@user.noreply.github.com' git add -A git commit -m "new coding guidelines MD File created" - git push origin '${{ github.ref }}' - + git push origin '${{ github.ref }}' \ No newline at end of file From 36b93c1e36c98035eb71bb5f77a07cd40502a83b Mon Sep 17 00:00:00 2001 From: Kevin Bost Date: Wed, 7 Apr 2021 14:59:00 -0700 Subject: [PATCH 2/4] Rev package to net5 --- XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj | 2 +- XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.sln | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj b/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj index a020d454..f05c752e 100644 --- a/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj +++ b/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 9.0 true IntelliTect.EssentialCSharp.Publishing diff --git a/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.sln b/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.sln index 17384b3b..3a790ba9 100644 --- a/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.sln +++ b/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.sln @@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\..\.github\workflows\ConvertGuidelinesXmlToMarkdown.yml = ..\..\.github\workflows\ConvertGuidelinesXmlToMarkdown.yml ..\..\docs\coding\csharp.md = ..\..\docs\coding\csharp.md ..\..\docs\Guidelines(8th Edition).xml = ..\..\docs\Guidelines(8th Edition).xml + ..\..\.github\workflows\manuallyRunXmlToMD.yml = ..\..\.github\workflows\manuallyRunXmlToMD.yml EndProjectSection EndProject Global From 37723336ebe5c8828b4b5f02fa8a0133c78ecebc Mon Sep 17 00:00:00 2001 From: Kevin Bost Date: Wed, 7 Apr 2021 15:04:19 -0700 Subject: [PATCH 3/4] Add argument checks Fixing yaml newlines (dumb dumb dumb) --- .github/workflows/ConvertGuidelinesXmlToMarkdown.yml | 4 ++-- .github/workflows/manuallyRunXmlToMD.yml | 4 ++-- XMLtoMD/GuidelineXmlToMD/Program.cs | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml b/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml index a672b99b..6fbb675b 100644 --- a/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml +++ b/.github/workflows/ConvertGuidelinesXmlToMarkdown.yml @@ -40,8 +40,8 @@ jobs: if: ${{ steps.diff.outputs.modified == 'true' }} - name: restore_compile_run_createMD - run: | - dotnet run --configuration Release --project ./XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj + run: > + dotnet run --configuration Release --project ./XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj -- --xml-input-file "./docs/${{ env.XmlFileName }}" --markdown-output-file "./docs/coding/csharp.md" if: ${{ steps.diff.outputs.modified == 'true' }} diff --git a/.github/workflows/manuallyRunXmlToMD.yml b/.github/workflows/manuallyRunXmlToMD.yml index 07aa10ba..40708c81 100644 --- a/.github/workflows/manuallyRunXmlToMD.yml +++ b/.github/workflows/manuallyRunXmlToMD.yml @@ -30,8 +30,8 @@ jobs: dotnet-version: 5.0.201 - name: restore_compile_run_createMD - run: | - dotnet run --configuration Release --project ./XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj + run: > + dotnet run --configuration Release --project ./XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj -- --xml-input-file "./docs/${{ env.XmlFileName }}" --markdown-output-file "./docs/coding/csharp.md" - name: Create commit and push to CodingGuideLinesMDUpdate diff --git a/XMLtoMD/GuidelineXmlToMD/Program.cs b/XMLtoMD/GuidelineXmlToMD/Program.cs index d8c20e09..1120e11c 100644 --- a/XMLtoMD/GuidelineXmlToMD/Program.cs +++ b/XMLtoMD/GuidelineXmlToMD/Program.cs @@ -21,11 +21,22 @@ class Program /// Injected by System.CommandLine static void Main(FileInfo xmlInputFile, FileInfo markdownOutputFile, IConsole console) { + if (xmlInputFile is null) + { + throw new ArgumentNullException(nameof(xmlInputFile)); + } + + if (markdownOutputFile is null) + { + throw new ArgumentNullException(nameof(markdownOutputFile)); + } + if (console is null) { throw new ArgumentNullException(nameof(console)); } + if (!xmlInputFile.Exists) { throw new FileNotFoundException("Could not find input file", xmlInputFile.FullName); From a12daa06a9ebd97f8d073ceb013bb7c1dfd339dc Mon Sep 17 00:00:00 2001 From: Kevin Bost Date: Wed, 7 Apr 2021 15:15:26 -0700 Subject: [PATCH 4/4] Fixing pipeline to ignore markdown tool --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 15658772..2a4eafdd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,7 +32,7 @@ steps: - task: VSBuild@1 displayName: 'Build' inputs: - solution: '**/*.sln' + solution: 'IntelliTect.Analyzer.sln' clean: true configuration: 'Release' msbuildArgs: '/p:Version=$(version)'