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

Update Roslyn to 4.13.0-3.24620.4 #2642

Merged
merged 18 commits into from
Dec 31, 2024
Merged

Update Roslyn to 4.13.0-3.24620.4 #2642

merged 18 commits into from
Dec 31, 2024

Conversation

JoeRobich
Copy link
Member

No description provided.

@@ -47,7 +45,7 @@ protected OmniSharpTestHost CreateMSBuildTestHost(string path, IEnumerable<Expor
IConfiguration configurationData = null)
{
var environment = new OmniSharpEnvironment(path, logLevel: LogLevel.Trace);
var serviceProvider = TestServiceProvider.Create(this.TestOutput, environment, this.LoggerFactory, _assemblyLoader, _analyzerAssemblyLoader, _msbuildLocator,
var serviceProvider = TestServiceProvider.Create(this.TestOutput, environment, this.LoggerFactory, _assemblyLoader, ShadowCopyAnalyzerAssemblyLoader.CreateShadowCopyLoader(), _msbuildLocator,
Copy link
Member Author

Choose a reason for hiding this comment

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

We can no longer use one assembly loader for all the test runs because it now gets disposed with the other test services. See dotnet/roslyn#74845

@@ -87,7 +87,7 @@ public static IServiceProvider Create(
var configuration = CreateConfiguration(configurationData);
var msbuildLocator = CreateMSBuildLocator(loggerFactory, assemblyLoader, configurationData);
var sharedTextWriter = CreateSharedTextWriter(testOutput);
var analyzerAssemblyLoader = ShadowCopyAnalyzerAssemblyLoader.Instance;
var analyzerAssemblyLoader = ShadowCopyAnalyzerAssemblyLoader.CreateShadowCopyLoader();
Copy link
Member Author

Choose a reason for hiding this comment

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

Another case where tests cannot share the same assembly loader.

@@ -120,7 +120,7 @@ private async Task VerifyImplementType(string code, string expectedChange, Dicti
Column = point.Offset,
FileName = testFile.FileName,
Buffer = testFile.Content.Code,
Identifier = "False;False;True:global::IFoo;AssemblyName;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction;",
Identifier = "False;False;True:global::IFoo;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction;",
Copy link
Member Author

Choose a reason for hiding this comment

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

Assembly Name removed in dotnet/roslyn@9c8c21f

Directory.Packages.props Outdated Show resolved Hide resolved
@@ -187,7 +187,7 @@ public async Task C2() {
Operator("="),
String("\"hello\""),
Punctuation(";"),
Keyword("await"),
ControlKeyword("await"),
Copy link
Member Author

Choose a reason for hiding this comment

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

Changed in dotnet/roslyn#75782

@@ -85,7 +85,7 @@ public Class1(string propertyHere)
public string PropertyHere { get; set; }
}";
var response = await RunRefactoringAsync(code, "Generate constructor...");
var response = await RunRefactoringAsync(code, "Generate constructor from members...");
Copy link
Member Author

Choose a reason for hiding this comment

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

Changed in dotnet/roslyn#76328

@@ -25,7 +25,7 @@ public class ScriptProjectProvider
private const string IgnoreCorLibraryDuplicatedTypesField = "IgnoreCorLibraryDuplicatedTypes";
private const string RuntimeMetadataReferenceResolverType = "Microsoft.CodeAnalysis.Scripting.Hosting.RuntimeMetadataReferenceResolver";
private const string ResolverField = "_resolver";
private const string FileReferenceProviderField = "_fileReferenceProvider";
private const string CreateFromFileFuncField = "_createFromFileFunc";
Copy link
Member Author

Choose a reason for hiding this comment

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

Changed in dotnet/roslyn#75372

@JoeRobich JoeRobich changed the title Update Roslyn to 4.13.0-1.24477.2 Update Roslyn to 4.13.0-3.24619.11 Dec 20, 2024
@JoeRobich JoeRobich changed the title Update Roslyn to 4.13.0-3.24619.11 Update Roslyn to 4.13.0-3.24620.4 Dec 20, 2024
workflow_dispatch:
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-12]
name: 'Build'
os: [ubuntu-20.04, windows-2022, macos-13]
Copy link
Member Author

Choose a reason for hiding this comment

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

I tried moving us to macos-14 but ran into OOM when publishing with ReadyToRun enabled. The arm64 MacOS runners only have 7GB of RAM as opposed to the other platforms having 14GB or more.

@JoeRobich JoeRobich marked this pull request as ready for review December 31, 2024 00:26
@JoeRobich JoeRobich merged commit 606e1f3 into master Dec 31, 2024
16 checks passed
@JoeRobich JoeRobich deleted the update-roslyn-4.13.x branch December 31, 2024 00:44
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.

2 participants