From 92821c707d8bef5ea135fd3c998719426846a04f Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:12:00 +0100 Subject: [PATCH 1/7] Update dotnet-build.yml --- .github/pipelines/dotnet-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/pipelines/dotnet-build.yml b/.github/pipelines/dotnet-build.yml index 9a1921ad..99d1a5cf 100644 --- a/.github/pipelines/dotnet-build.yml +++ b/.github/pipelines/dotnet-build.yml @@ -18,3 +18,7 @@ steps: inputs: projects: "**\\*.sln" arguments: -c ${{parameters.BuildConfiguration}} -p:${{parameters.BuildParameters}} --no-restore + - task: RoslynAnalyzers@3 + inputs: + copyLogsOnly: true + policyName: 'M365' From 9cae85d216e20bad54b992ca41664fb3d704f934 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:12:36 +0100 Subject: [PATCH 2/7] Update .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1bf9b591..491d60ae 100644 --- a/.gitignore +++ b/.gitignore @@ -332,4 +332,7 @@ ASALocalRun/ .mfractor/ # Disabling VSCode files -.vscode/ \ No newline at end of file +.vscode/ + +# Originals after merging +.orig From ebbb49e157c6265ea7c3ec319f4dfd1cb6bf0887 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:12:52 +0100 Subject: [PATCH 3/7] Update Directory.Build.props --- Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index a8e7089d..ac8f91d9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -80,4 +80,7 @@ $(MSBuildThisFileDirectory)=/ + + + From 012b70b7a680de0030d80b6a6e1e5cf5eae9776a Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:38:00 +0100 Subject: [PATCH 4/7] Update Directory.Build.props --- Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ac8f91d9..a8e7089d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -80,7 +80,4 @@ $(MSBuildThisFileDirectory)=/ - - - From ee3acf26889bb37bd3aba866a4009cb3319e30b0 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:39:46 +0100 Subject: [PATCH 5/7] Create 1espt --- .config/1espt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .config/1espt diff --git a/.config/1espt b/.config/1espt new file mode 100644 index 00000000..2ed67f11 --- /dev/null +++ b/.config/1espt @@ -0,0 +1,12 @@ +## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details. + +pipelines: + 25761: + retail: + source: + credscan: + lastModifiedDate: 2023-10-23 + eslint: + lastModifiedDate: 2023-10-23 + armory: + lastModifiedDate: 2023-10-23 From 617209f3b72d1c0d20008fca89d729f424e5a7af Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:40:02 +0100 Subject: [PATCH 6/7] Delete .config/1espt --- .config/1espt | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .config/1espt diff --git a/.config/1espt b/.config/1espt deleted file mode 100644 index 2ed67f11..00000000 --- a/.config/1espt +++ /dev/null @@ -1,12 +0,0 @@ -## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details. - -pipelines: - 25761: - retail: - source: - credscan: - lastModifiedDate: 2023-10-23 - eslint: - lastModifiedDate: 2023-10-23 - armory: - lastModifiedDate: 2023-10-23 From b741ecf6bc24b50c3e8ee7238e7e1783b62f81f3 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:40:41 +0100 Subject: [PATCH 7/7] Create PipelineAutobaseliningConfig.yml --- .config/1espt/PipelineAutobaseliningConfig.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .config/1espt/PipelineAutobaseliningConfig.yml diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml new file mode 100644 index 00000000..2ed67f11 --- /dev/null +++ b/.config/1espt/PipelineAutobaseliningConfig.yml @@ -0,0 +1,12 @@ +## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details. + +pipelines: + 25761: + retail: + source: + credscan: + lastModifiedDate: 2023-10-23 + eslint: + lastModifiedDate: 2023-10-23 + armory: + lastModifiedDate: 2023-10-23