Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@
<!-- Used by sdk to determine msbuild version for fsharp -->
<ExtraPackageVersionPropsPackageInfo Include="FSharpBuildVersion" Version="%24(MicrosoftBuildPackageVersion)" />

<!-- Used by roslyn-analyzsers to determine rsolyn version -->
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisForShippedApisVersion" Version="%24(MicrosoftCodeAnalysisVersion)" />
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion" Version="%24(MicrosoftCodeAnalysisVersion)" />

<!-- property used by Arcade to determine what version of SourceLink to use -->
<!-- if MicrosoftSourceLinkCommonPackageVersion is non-empty, then we've already built SourceLink, regardless of whether
this is the production or offline build, so we should use that version. -->
Expand Down
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>126527ff107ae93fed10af675506c56d046aa5a3</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>5c7721621bbab897c3ace6bf2c1489dda259eb9e</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
Expand Down
1,481 changes: 1,481 additions & 0 deletions patches/roslyn-analyzers/0001-WIP-for-source-build.patch

Large diffs are not rendered by default.

374 changes: 374 additions & 0 deletions patches/roslyn-analyzers/0002-Update-to-netstandard2.0.patch

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From f3f0b2eec1f707260718dbd6e44dfb785b7b5d82 Mon Sep 17 00:00:00 2001
From: Omair Majid <[email protected]>
Date: Fri, 6 Nov 2020 18:18:48 -0500
Subject: [PATCH 3/4] Update Microsoft.CodeAnalysis packages

The version used in 5.0 SDK is Microsoft.CodeAnalysis 3.8.0
---
eng/Versions.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index ced06221d..677b44310 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,10 +24,10 @@
<!-- Use the correct compiler version -->
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<!-- Roslyn -->
- <MicrosoftCodeAnalysisVersion>3.3.1</MicrosoftCodeAnalysisVersion>
- <MicrosoftCodeAnalysisCommonVersion>3.3.1</MicrosoftCodeAnalysisCommonVersion>
+ <MicrosoftCodeAnalysisVersion>3.8.0</MicrosoftCodeAnalysisVersion>
+ <MicrosoftCodeAnalysisCommonVersion>3.8.0</MicrosoftCodeAnalysisCommonVersion>
<MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion>
- <MicrosoftCodeAnalysisForShippedApisVersion>3.7.0</MicrosoftCodeAnalysisForShippedApisVersion>
+ <MicrosoftCodeAnalysisForShippedApisVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisForShippedApisVersion>
<DogfoodAnalyzersVersion>3.3.0</DogfoodAnalyzersVersion>
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
<MicrosoftCodeAnalysisFXCopAnalyzersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisFXCopAnalyzersVersion>
--
2.26.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 1839e0370d5416b45f0a8fbcc370f4984237f1ba Mon Sep 17 00:00:00 2001
From: Omair Majid <[email protected]>
Date: Mon, 9 Nov 2020 11:52:28 -0500
Subject: [PATCH 4/4] Fix version for Microsoft.CodeAnalysis.CSharp.CodeStyle

---
eng/Versions.props | 2 +-
src/Directory.Build.props | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 677b44310..f9e213be1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
<MicrosoftCodeAnalysisAnalyzersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<RoslynDiagnosticsAnalyzersVersion>$(DogfoodAnalyzersVersion)</RoslynDiagnosticsAnalyzersVersion>
- <CodeStyleAnalyersVersion>3.8.0-2.20427.18</CodeStyleAnalyersVersion>
+ <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-2.20427.18</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.0-pre-20160714</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<!-- Roslyn Testing -->
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20374.2</MicrosoftCodeAnalysisTestingVersion>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 24e9fe3eb..6c95f9d7b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -25,7 +25,7 @@

<!-- Code Style analyzers -->
<ItemGroup Condition="'$(Language)' == 'C#'">
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(CodeStyleAnalyersVersion)" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisCSharpCodeStyleVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(Language)' == 'VB'">
<!-- https://github.com/dotnet/roslyn-analyzers/issues/2095 tracks uncommenting the below -->
--
2.26.2

38 changes: 38 additions & 0 deletions repos/roslyn-analyzers.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<BuildCommandArgs>--restore --build --pack</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) --configuration $(Configuration)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -bl</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -warnaserror false</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:TreatWarningsAsErrors=false</BuildCommandArgs>

<!-- Versioning args. -->
<BuildCommandArgs>$(BuildCommandArgs) /p:OfficialBuild=true</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:DotNetBuildFromSource=true</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:GitHubRepositoryName=roslyn-analyzers</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:RepositoryUrl=git://github.com/dotnet/roslyn-analyzers</BuildCommandArgs>

<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>

<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="runtime" />
<RepositoryReference Include="roslyn" />
</ItemGroup>

<ItemGroup>
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>
1 change: 1 addition & 0 deletions repos/sdk.proj
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<RepositoryReference Include="newtonsoft-json" />
<RepositoryReference Include="newtonsoft-json901" />
<RepositoryReference Include="nuget-client" />
<RepositoryReference Include="roslyn-analyzers" />
<RepositoryReference Include="vstest" />
<RepositoryReference Include="fsharp" />
</ItemGroup>
Expand Down
12 changes: 10 additions & 2 deletions tools-local/prebuilt-baseline-offline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<Dir>src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/</Dir>
<Dir>src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/</Dir>
<Dir>src/package-source-build/</Dir>
<Dir>src/roslyn-analyzers.5c7721621bbab897c3ace6bf2c1489dda259eb9e/</Dir>
<Dir>src/roslyn.4c195c3ac1974edcefa76774d7a59a2350ec55fa/</Dir>
<Dir>src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/</Dir>
<Dir>src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/</Dir>
Expand Down Expand Up @@ -155,13 +156,17 @@
<Usage Id="System.Private.Uri" Version="4.3.0" />
<!--End portable-build only prebuilts-->
<Usage Id="Humanizer.Core" Version="2.2.0" />
<Usage Id="MicroBuild.Core" Version="0.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20451.17" />
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.AspNetCore.Components.WebAssembly.Templates" Version="3.2.1" />
<Usage Id="Microsoft.Build.Traversal" Version="2.1.1" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0" />
<Usage Id="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0" />
<Usage Id="Microsoft.CodeQuality.Analyzers" Version="3.3.0" />
<Usage Id="Microsoft.Docker.Sdk" Version="1.1.0" />
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
Expand All @@ -180,6 +185,7 @@
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.8" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.0" />
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
<Usage Id="Microsoft.NetCore.Analyzers" Version="3.3.0" />
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.3" />
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.1.7" />
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
Expand All @@ -195,6 +201,7 @@
<Usage Id="Microsoft.NETCore.Platforms" Version="3.1.0" />
<Usage Id="Microsoft.NETCore.Targets" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.3" />
<Usage Id="Microsoft.NetFramework.Analyzers" Version="3.3.0" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.0-preview.2" />
Expand All @@ -213,6 +220,7 @@
<Usage Id="NUnit3.DotNetNew.Template" Version="1.6.5" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.7.2" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.8.1" />
<Usage Id="Roslyn.Diagnostics.Analyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="System.ComponentModel.Annotations" Version="4.7.0" />
<Usage Id="System.Drawing.Common" Version="4.7.0" />
<Usage Id="System.Security.Cryptography.Algorithms" Version="4.3.1" />
Expand Down
12 changes: 10 additions & 2 deletions tools-local/prebuilt-baseline-online.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<Dir>artifacts/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/</Dir>
<Dir>artifacts/src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/</Dir>
<Dir>src/package-source-build/</Dir>
<Dir>artifacts/src/roslyn-analyzers.5c7721621bbab897c3ace6bf2c1489dda259eb9e/</Dir>
<Dir>artifacts/src/roslyn.4c195c3ac1974edcefa76774d7a59a2350ec55fa/</Dir>
<Dir>artifacts/src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/</Dir>
<Dir>artifacts/src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/</Dir>
Expand Down Expand Up @@ -71,13 +72,18 @@
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.9.6" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0" />
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
<Usage Id="Microsoft.CodeAnalysis.Common" Version="3.4.0" />
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-2.20414.4" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0" />
<Usage Id="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="3.8.0-2.20414.4" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeQuality.Analyzers" Version="3.3.0" />
<Usage Id="Microsoft.CSharp" Version="4.0.1" IsDirectDependency="true" />
<Usage Id="Microsoft.CSharp" Version="4.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Docker.Sdk" Version="1.1.0" />
Expand All @@ -103,6 +109,7 @@
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="3.1.6" IsDirectDependency="true" />
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
<Usage Id="Microsoft.NetCore.Analyzers" Version="3.3.0" />
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.3" />
Expand All @@ -127,6 +134,7 @@
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.3" />
<Usage Id="Microsoft.NETCore.Targets" Version="2.1.0" />
<Usage Id="Microsoft.NetFramework.Analyzers" Version="3.3.0" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.0-preview.2" />
Expand Down Expand Up @@ -178,6 +186,7 @@
<Usage Id="NUnit3.DotNetNew.Template" Version="1.6.5" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.7.2" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.8.1" />
<Usage Id="Roslyn.Diagnostics.Analyzers" Version="3.3.0" IsDirectDependency="true" />
<Usage Id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="debian.8-x64" />
<Usage Id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="debian.8-x64" />
<Usage Id="runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="fedora.23-x64" />
Expand Down Expand Up @@ -427,7 +436,6 @@
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.9.0" />
<Usage Id="System.Threading.Tasks.Extensions" Version="4.0.0" />
<Usage Id="System.Threading.Tasks.Extensions" Version="4.3.0" />
<Usage Id="System.Threading.Tasks.Extensions" Version="4.5.2" />
<Usage Id="System.Threading.Tasks.Extensions" Version="4.5.3" />
<Usage Id="System.Threading.Tasks.Extensions" Version="4.5.4" />
<Usage Id="System.Threading.Tasks.Parallel" Version="4.3.0" />
Expand Down