Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
544fa8a
Update out-of-band generators to explicitly reference pinned versions…
jkoritzinsky Jan 15, 2022
1e4f98f
Update Roslyn and update the DllImportGenerator incremental generatio…
jkoritzinsky Jan 19, 2022
1f5ea02
Bump Roslyn to get the bugfix and finish updating the incremental gen…
jkoritzinsky Jan 21, 2022
cbe6dc2
Merge branch 'main' into update-roslyn
jkoritzinsky Jan 21, 2022
4e491b2
Merge branch 'main' of github.com:dotnet/runtime into update-roslyn
jkoritzinsky Feb 4, 2022
8cdb7d0
Escape per CS8981 throughout the repo.
jkoritzinsky Feb 4, 2022
c40fcb2
Fix build
jkoritzinsky Feb 7, 2022
0b06bd9
Import test_dependencies' nuget-generated props/targets since we don'…
jkoritzinsky Feb 9, 2022
bfc324a
Merge branch 'main' of github.com:dotnet/runtime into update-roslyn
jkoritzinsky Feb 9, 2022
cd57d2b
Unify roslyn version.
jkoritzinsky Feb 9, 2022
4a7b84d
Remove some extraneous escapes in comments
jkoritzinsky Feb 9, 2022
ea30f83
Fix build failures other than the binary/text issue.
jkoritzinsky Feb 10, 2022
979ca2f
Merge branch 'main' of github.com:dotnet/runtime into update-roslyn
jkoritzinsky Feb 18, 2022
1bb9514
Update compiler toolset to get dotnet/roslyn#59578
jkoritzinsky Feb 18, 2022
bfb3115
Update Roslyn version again to get latest fix.
jkoritzinsky Feb 23, 2022
100f65c
Merge branch 'main' into update-roslyn
jkoritzinsky Feb 24, 2022
b44c0ec
PR feedback and update Roslyn again now that Chris has actually put i…
jkoritzinsky Feb 28, 2022
cc60244
Disable capitalization warning in the src/tests tree
jkoritzinsky Mar 2, 2022
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
Prev Previous commit
Next Next commit
Merge branch 'main' into update-roslyn
  • Loading branch information
jkoritzinsky authored Feb 24, 2022
commit 100f65c5bb86cf54e2a602c57c1af90dd55a486a
20 changes: 1 addition & 19 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,6 @@
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
<!--
Servicing build settings for Setup/Installer packages. Instructions:

* To enable a package build for the current patch release, set PatchVersion to match the current
patch version of that package. ("major.minor.patch".) This is normally the same as
PatchVersion above, but not always. Notably, NETStandard has its own patch version.
* When the PatchVersion property above is incremented at the beginning of the next servicing
release, all packages listed below automatically stop building because the property no longer
matches the metadata. (Do not delete the items!)

If the PatchVersion below is never changed from '0', the package will build in the 'main'
branch, and during a forked RTM release ("X.Y.0"). It will stop building for "X.Y.1" unless
manually enabled by updating the metadata.
-->
<ItemGroup>
<!-- Targeting packs are only patched in extreme cases. -->
<ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="0" />
</ItemGroup>
<!--
For source generator support we need to target multiple versions of Rolsyn in order to be able to run on older versions of Roslyn.
We pin these versions as we need to match them exactly for any scenarios that run Roslyn on .NET Framework, like Visual Studio.
Expand All @@ -55,7 +37,7 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.2.0-2.22123.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.2.0-2.22123.2</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.2.0-2.22123.2</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22115.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22119.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisVersion>4.2.0-2.22123.2</MicrosoftCodeAnalysisVersion>
<!--
TODO: Remove pinned compiler version once arcade supplies runtime with a compiler capable of handling !!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ private static (MemberDeclarationSyntax, ImmutableArray<Diagnostic>) GenerateSou
return (PrintGeneratedSource(originalSyntax, dllImportStub.StubContext, code), dllImportStub.Diagnostics.AddRange(diagnostics.Diagnostics));
}

private static MemberDeclarationSyntax PrintForwarderStub(MethodDeclarationSyntax userDeclaredMethod, IncrementalStubGenerationContext stub)
private static MemberDeclarationSyntax PrintForwarderStub(MethodDeclarationSyntax userDeclaredMethod, IncrementalStubGenerationContext stub, GeneratorDiagnostics diagnostics)
{
GeneratedDllImportData targetDllImportData = GetTargetDllImportDataFromStubData(
stub.DllImportData,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.