Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #7096

Merged
merged 29 commits into from
Jan 16, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Dec 14, 2023

This pull request updates the following dependencies

From https://github.com/dotnet/arcade

  • Subscription: 76dfce4f-6528-42c1-dffb-08d8df7e96ad
  • Build: 20240105.2
  • Date Produced: January 5, 2024 7:12:42 PM UTC
  • Commit: bab85ba4579526962b0dbb0aa4db625c50da8859
  • Branch: refs/heads/main

…213.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23613.3
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner December 14, 2023 13:16
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approve

Copy link

codecov bot commented Dec 14, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5df6c39) 96.42% compared to head (3e1ad0e) 96.44%.
Report is 38 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7096      +/-   ##
==========================================
+ Coverage   96.42%   96.44%   +0.01%     
==========================================
  Files        1412     1413       +1     
  Lines      337058   337713     +655     
  Branches    11145    11176      +31     
==========================================
+ Hits       325023   325693     +670     
+ Misses       9229     9201      -28     
- Partials     2806     2819      +13     

…214.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23614.6
…214.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23614.6
…215.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23615.2
…215.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23615.2
…219.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23619.2
…220.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23620.1
…220.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23620.7
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…221.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2
…228.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1
…228.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1
…228.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1
…228.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1
@mavasani
Copy link
Contributor

mavasani commented Jan 2, 2024

Failing CI:

CSC(0,0): error CS9057: (NETCORE_ENGINEERING_TELEMETRY=Build) The analyzer assembly '/mnt/vss/_work/1/s/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0-alpha.1.23614.10/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll' references version '4.7.0.0' of the compiler, which is newer than the currently running version '4.6.0.0'.

I believe this change requires us to bump all the 4.6.* versions in https://github.com/dotnet/roslyn-analyzers/blob/main/eng/Versions.props to 4.7.0

@mavasani
Copy link
Contributor

mavasani commented Jan 2, 2024

[Check failure on line 70 in .packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.23628.1/tools/SourceBuild/AfterSourceBuild.proj](https://github.com/dotnet/roslyn-analyzers/pull/7096/files#annotation_16708996784) 

@azure-pipelinesazure-pipelines
/ roslyn-analyzers-CI (Source-Build ())
.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.23628.1/tools/SourceBuild/AfterSourceBuild.proj#L70
.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.23628.1/tools/SourceBuild/AfterSourceBuild.proj(70,5): error : (NETCORE_ENGINEERING_TELEMETRY=AfterSourceBuild) 7 new pre-builts discovered! Detailed usage report can be found at /mnt/vss/_work/1/s/artifacts/sb/prebuilt-report/baseline-comparison.xml.
See https://aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them.
Package IDs are:
Microsoft.CodeAnalysis.4.7.0
Microsoft.CodeAnalysis.Common.4.7.0
Microsoft.CodeAnalysis.CSharp.4.7.0
Microsoft.CodeAnalysis.CSharp.Workspaces.4.7.0
Microsoft.CodeAnalysis.VisualBasic.4.7.0
Microsoft.CodeAnalysis.VisualBasic.Workspaces.4.7.0
Microsoft.CodeAnalysis.Workspaces.Common.4.7.0

@mthalman @MichaelSimons for help in fixing source build

@MichaelSimons
Copy link
Member

@mthalman @MichaelSimons for help in fixing source build

@mavasani, For source-build issues, please ping the @dotnet/source-build-internal team for quicker responses. TIA.

@Evangelink
Copy link
Member

Evangelink commented Jan 2, 2024

Failing CI:

CSC(0,0): error CS9057: (NETCORE_ENGINEERING_TELEMETRY=Build) The analyzer assembly '/mnt/vss/_work/1/s/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0-alpha.1.23614.10/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll' references version '4.7.0.0' of the compiler, which is newer than the currently running version '4.6.0.0'.

I believe this change requires us to bump all the 4.6.* versions in main/eng/Versions.props to 4.7.0

@mavasani I have had this issue (and similar with AD0001) last year and got it fixed by setting BuildWithNetFrameworkHostedCompiler (see dotnet/arcade#14311). I also just fixed another repo with the same trick: https://github.com/microsoft/vstest/pull/4795/files#diff-9da24614831c308827a1ae533ffea392c97638c261dd42bd0f5226baa136d16eR84.

@sharwell is aware of the issue.

@mavasani mavasani force-pushed the darc-main-bdd038b8-0310-49cc-9da3-0196d1e0f5c5 branch from a44a14b to 324233f Compare January 3, 2024 09:56
@mavasani
Copy link
Contributor

mavasani commented Jan 3, 2024

@Evangelink That did not seem to help..

@Evangelink
Copy link
Member

@Evangelink That did not seem to help..

Oh interesting! It did fix 4 of our repos, maybe we are doing the build differently here (I'll try to have a look this afternoon).

@Evangelink
Copy link
Member

Setting UsingToolMicrosoftNetCompilers to false is fixing the issue locally for me but I am not sure about the consequences of that change.

…102.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24052.3
…103.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24053.1
@ellahathaway
Copy link
Member

ellahathaway commented Jan 4, 2024

Responding on behalf of @dotnet/source-build-internal.

Bumping

<MicrosoftNetCompilersToolsetVersion>4.6.0</MicrosoftNetCompilersToolsetVersion>
to 4.7.0 gave me a clean local build but introduced the following prebuilts:

<Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/GenerateAnalyzerNuspec/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/GenerateDocumentationAndConfigFiles/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/GenerateDocumentationAndConfigFilesForBrokenRuntime/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.AnalyzerUtilities.Package/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.AnalyzerUtilities/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.Analyzers.Package/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.Analyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.CSharp.Analyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.CSharp.NetAnalyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.NetAnalyzers.Package/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.NetAnalyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.ResxSourceGenerator/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.VisualBasic.Analyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Roslyn.Diagnostics.Analyzers.Package/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Roslyn.Diagnostics.Analyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Roslyn.Diagnostics.CSharp.Analyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />
    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="4.7.0" File="src/artifacts/obj/Roslyn.Diagnostics.VisualBasic.Analyzers/project.assets.json" IsDirectDependency="true" IsAutoReferenced="true" />

These prebuilts can be eliminated by following https://github.com/dotnet/source-build/blob/main/Documentation/eliminating-pre-builts.md#eliminating-pre-builts

…104.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24054.2
…105.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24055.2
…105.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24055.2
@ViktorHofer
Copy link
Member

Setting UsingToolMicrosoftNetCompilers to false (or deleting that setting) makes most sense as what you get via the SDK is already a recent enough compiler. No need to bring a newer one via the toolset package.

…105.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24055.2
…108.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24058.6
@ViktorHofer
Copy link
Member

This is one of the remaining two repositories that haven't yet upgraded to the .NET 9 SDK which plan to upgrade (see dotnet/source-build#3770). Can someone please take a look? As mentioned above the right fix could be to just remove the toolset compiler package reference.

cc @carlossanlop in case you still help with roslyn-analyzer PRs

@mavasani
Copy link
Contributor

@ViktorHofer That worked fine, thanks! Merging this PR..

@mavasani mavasani merged commit ae3bd81 into main Jan 16, 2024
11 checks passed
@mavasani mavasani deleted the darc-main-bdd038b8-0310-49cc-9da3-0196d1e0f5c5 branch January 16, 2024 04:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants