From 13a77f55d5c3ea4531a2a1083a8f2b0562e54279 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Mon, 30 Aug 2021 16:00:50 -0700 Subject: [PATCH 1/2] esnure path to global config file is correctly cased fixes https://github.com/dotnet/roslyn-analyzers/issues/5360 --- src/CodeStyle/Tools/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CodeStyle/Tools/Program.cs b/src/CodeStyle/Tools/Program.cs index c268ff7faaf91..b8ac9ce91f3d8 100644 --- a/src/CodeStyle/Tools/Program.cs +++ b/src/CodeStyle/Tools/Program.cs @@ -235,6 +235,7 @@ static string GetTargetContents(string language) <_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle Condition=""'$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle)' == ''"">{nameof(AnalysisMode.Default)} <_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle>AnalysisLevelStyle_$(_GlobalAnalyzerConfigAnalysisMode_MicrosoftCodeAnalysis{language}CodeStyle).editorconfig + <_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle>$(_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle.ToLowerInvariant()) <_GlobalAnalyzerConfigDir_MicrosoftCodeAnalysis{language}CodeStyle Condition=""'$(_GlobalAnalyzerConfigDir_MicrosoftCodeAnalysis{language}CodeStyle)' == ''"">$(MSBuildThisFileDirectory)config <_GlobalAnalyzerConfigFile_MicrosoftCodeAnalysis{language}CodeStyle Condition=""'$(_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle)' != ''"">$(_GlobalAnalyzerConfigDir_MicrosoftCodeAnalysis{language}CodeStyle)\$(_GlobalAnalyzerConfigFileName_MicrosoftCodeAnalysis{language}CodeStyle) From 9d6b75b6871a7c9db84e313009d49c0154c5afbb Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 1 Sep 2021 11:04:12 -0700 Subject: [PATCH 2/2] Remove OneLoc job from dev16.11 --- azure-pipelines-official.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 8c0ff454fe1e6..c231b7b60e394 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -67,14 +67,6 @@ stages: displayName: Build and Test jobs: - - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev16.11-vs-deps') }}: - - template: /eng/common/templates/job/onelocbuild.yml - parameters: - MirrorRepo: roslyn - MirrorBranch: release/dev16.11-vs-deps - LclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-ROSLYN' - - job: OfficialBuild displayName: Official Build timeoutInMinutes: 360