Skip to content

Commit 1092cb5

Browse files
author
Damir
committed
Update iPlusAvalonia.slnx, Directory.Packages.props, and Morgania dependencies to support RoslynPad up to 77d4e7a 
1 parent 1d36029 commit 1092cb5

12 files changed

Lines changed: 48 additions & 506 deletions

File tree

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<Features>strict</Features>
3434
<Deterministic>True</Deterministic>
3535
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
36+
<!-- CS0436: IgnoresAccessChecksToAttribute generated in multiple friend assemblies. Suppress to allow friend access checks across Morgania assemblies. -->
37+
<NoWarn>$(NoWarn);CS0436</NoWarn>
38+
<!-- Suppress NuGet security audit warnings as build errors for known transitive dependencies (e.g. Nerdbank.MessagePack via Microsoft.VisualStudio.Composition) -->
39+
<WarningsNotAsErrors>$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
3640
<Version>5.9.1</Version>
3741
<RoslynPadVersion>22.1.0</RoslynPadVersion>
3842
<ApplicationVersion>$(RoslynPadVersion.Replace('.', ''))</ApplicationVersion>

‎Directory.Packages.props‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,43 @@
1010

1111
<PropertyGroup>
1212
<DotNetExtensionsVersion Condition="'$(DotNetExtensionsVersion)' == ''">10.0.11</DotNetExtensionsVersion>
13-
<!-- Use CodeAnalysisVersion from iPlus when UseAvaloniaFork is True, otherwise use upstream's RoslynVersion -->
14-
<RoslynVersion Condition="'$(RoslynVersion)' == '' AND '$(UseAvaloniaFork)' == 'True'">$(CodeAnalysisVersion)</RoslynVersion>
15-
<RoslynVersion Condition="'$(RoslynVersion)' == '' AND '$(UseAvaloniaFork)' != 'True'">5.9.0</RoslynVersion>
16-
<!-- https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-tools/NuGet/Microsoft.CodeAnalysis.LanguageServer.Protocol/ -->
17-
<RoslynPrivateVersion Condition="'$(RoslynPrivateVersion)' == ''">5.0.0-2.25567.12</RoslynPrivateVersion>
13+
<RoslynVersion>5.9.0</RoslynVersion>
1814
<AvaloniaVersion Condition="'$(AvaloniaVersion)' == ''">12.1.1</AvaloniaVersion>
1915
<NuGetVersion Condition="'$(NuGetVersion)' == ''">7.9.0</NuGetVersion>
2016
<DockAvaloniaVersion Condition="'$(DockAvaloniaVersion)' == ''">12.1.0.1</DockAvaloniaVersion>
21-
<MessagePackVersion Condition="'$(MessagePackVersion)' == ''">3.1.4</MessagePackVersion>
2217
</PropertyGroup>
2318

24-
<ItemGroup Condition="'$(UseAvaloniaFork)' == 'False'">
25-
<PackageVersion Include="AvalonEdit" Version="6.3.1.120" />
26-
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
19+
<ItemGroup>
20+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynVersion)" />
21+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynVersion)" />
22+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersion)" />
23+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
24+
<PackageVersion Update="Microsoft.CodeAnalysis.Features" Version="$(RoslynVersion)" />
25+
<PackageVersion Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynVersion)" />
26+
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(RoslynVersion)" />
27+
<PackageVersion Update="Microsoft.CodeAnalysis.Scripting.Common" Version="$(RoslynVersion)" />
28+
<PackageVersion Update="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0-1.26328.17" />
29+
<PackageVersion Update="System.Configuration.ConfigurationManager" Version="10.0.1" />
30+
</ItemGroup>
31+
32+
<ItemGroup Condition="'$(UseAvaloniaFork)' != 'True'">
2733
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
2834
<PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersion)" />
2935
<PackageVersion Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
3036
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
3137
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
32-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.4" />
33-
<PackageVersion Include="AvalonLibrary" Version="4.0.1" />
3438
<PackageVersion Include="DialogHost.Avalonia" Version="0.12.3" />
35-
<PackageVersion Include="Dirkster.AvalonDock" Version="4.73.0" />
36-
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.73.0" />
39+
<PackageVersion Include="Dock.Avalonia.Themes.Fluent" Version="$(DockAvaloniaVersion)" />
3740
<PackageVersion Include="Dock.Avalonia" Version="$(DockAvaloniaVersion)" />
3841
<PackageVersion Include="Dock.Model.Avalonia" Version="$(DockAvaloniaVersion)" />
39-
<PackageVersion Include="Dock.Avalonia.Themes.Fluent" Version="$(DockAvaloniaVersion)" />
4042
<PackageVersion Include="ICSharpCode.Decompiler" Version="11.0.0.9375" />
4143
<PackageVersion Include="IgnoresAccessChecksToGenerator" Version="1.0.0" />
42-
<PackageVersion Include="MessagePack" Version="$(MessagePackVersion)" />
4344
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynVersion)" />
4445
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynVersion)" />
4546
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersion)" />
4647
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
47-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(RoslynVersion)" />
4848
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(RoslynVersion)" />
4949
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynVersion)" />
50-
<PackageVersion Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="$(RoslynPrivateVersion)" />
5150
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
5251
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(DotNetExtensionsVersion)" />
5352
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(DotNetExtensionsVersion)" />
@@ -63,8 +62,6 @@
6362
<PackageVersion Include="Nerdbank.Streams" Version="2.13.31" />
6463
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
6564
<PackageVersion Include="NuGet.Commands" Version="$(NuGetVersion)" />
66-
<PackageVersion Include="NuGet.Packaging" Version="$(NuGetVersion)" />
67-
<PackageVersion Include="NuGet.Protocol" Version="$(NuGetVersion)" />
6865
<PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersion)" />
6966
<PackageVersion Include="StreamJsonRpc" Version="2.25.29" />
7067
<PackageVersion Include="System.ComponentModel.Composition" Version="$(DotNetExtensionsVersion)" />
@@ -74,12 +71,8 @@
7471
<PackageVersion Include="System.Memory.Data" Version="$(DotNetExtensionsVersion)" />
7572
<PackageVersion Include="System.Reactive.Core" Version="6.1.0" />
7673
<PackageVersion Include="System.Reactive.Linq" Version="6.1.0" />
77-
<PackageVersion Include="Tmds.DBus.Protocol" Version="0.92.0" />
7874
<PackageVersion Include="System.Reflection.Metadata" Version="$(DotNetExtensionsVersion)" />
7975
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(DotNetExtensionsVersion)" />
8076
<PackageVersion Include="System.Text.Json" Version="$(DotNetExtensionsVersion)" />
81-
<PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
82-
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.0" />
8377
</ItemGroup>
84-
8578
</Project>

‎iPlusAvalonia.slnx‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
<Solution>
2-
<Configurations>
3-
<Platform Name="Any CPU" />
4-
<Platform Name="x64" />
5-
</Configurations>
6-
<Folder Name="/Build/">
7-
<Project Path="src/RoslynPad.Build/RoslynPad.Build.csproj" />
8-
</Folder>
92
<Folder Name="/Common/">
10-
<Project Path="src/RoslynPad.Common.UI/RoslynPad.Common.UI.csproj" />
3+
<Project Path="src/RoslynPad.BuildTasks/RoslynPad.BuildTasks.csproj" />
114
<Project Path="src/RoslynPad.Runtime/RoslynPad.Runtime.csproj" />
5+
<Project Path="src/RoslynPad.Runtime.Secrets/RoslynPad.Runtime.Secrets.csproj" />
126
</Folder>
13-
<Folder Name="/Editor/">
14-
<Project Path="src/RoslynPad.Editor.Avalonia/RoslynPad.Editor.Avalonia.csproj" />
15-
<Project Path="src/RoslynPad.Editor.Windows/RoslynPad.Editor.Windows.csproj" />
16-
</Folder>
17-
<Folder Name="/Roslyn/">
18-
<Project Path="src/RestoreHelper/RestoreHelper.csproj" />
19-
<Project Path="src/RoslynPad.Roslyn.Avalonia/RoslynPad.Roslyn.Avalonia.csproj" />
20-
<Project Path="src/RoslynPad.Roslyn.Windows/RoslynPad.Roslyn.Windows.csproj" />
21-
<Project Path="src/RoslynPad.Roslyn/RoslynPad.Roslyn.csproj" />
22-
</Folder>
23-
<Folder Name="/Solution Items/">
7+
<Folder Name="/_Build/">
248
<File Path=".editorconfig" />
259
<File Path="Directory.Build.props" />
2610
<File Path="Directory.Build.targets" />
2711
<File Path="Directory.Packages.props" />
2812
<File Path="global.json" />
2913
<File Path="nuget.config" />
3014
</Folder>
31-
<Project Path="src/RoslynPad.Avalonia/RoslynPad.Avalonia.csproj" />
15+
<Folder Name="/Morgania/">
16+
<Project Path="src/Morgania.Editor/Morgania.Editor.csproj" />
17+
<Project Path="src/Morgania.Editor.Abstractions/Morgania.Editor.Abstractions.csproj" />
18+
<Project Path="src/Morgania.Demo.EditorFeatures/Morgania.Demo.EditorFeatures.csproj" />
19+
<Project Path="src/Morgania.Demo/Morgania.Demo.csproj" />
20+
<Project Path="src/Morgania.CodeAnalysis.EditorFeatures/Morgania.CodeAnalysis.EditorFeatures.csproj" />
21+
<Project Path="src/Morgania.CodeAnalysis.Editor/Morgania.CodeAnalysis.Editor.csproj" />
22+
</Folder>
23+
<Folder Name="/Tests/">
24+
<Project Path="tests/Morgania.BehaviorTests/Morgania.BehaviorTests.csproj" />
25+
<Project Path="tests/Morgania.CompositionTests/Morgania.CompositionTests.csproj" />
26+
<Project Path="tests/Morgania.ExtensionConformance/Morgania.ExtensionConformance.csproj" />
27+
<Project Path="tests/Morgania.GeometryTests/Morgania.GeometryTests.csproj" />
28+
<Project Path="tests/Morgania.IntellisenseTests/Morgania.IntellisenseTests.csproj" />
29+
</Folder>
30+
<Project Path="src/RoslynPad/RoslynPad.csproj" DefaultStartup="true" />
3231
<Project Path="src/RoslynPad.Themes/RoslynPad.Themes.csproj" />
33-
<Project Path="src/RoslynPad/RoslynPad.csproj" />
3432
</Solution>

‎src/Morgania.CodeAnalysis.Editor/Morgania.CodeAnalysis.Editor.csproj‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<PackageId>iPlus.RoslynPad.Roslyn</PackageId>
4-
<TargetFramework>$(LtsTargetFramework)</TargetFramework>
5-
<Description>Exposes many Roslyn editor services that are currently internal. The version of this package corresponds to the Roslyn packages.</Description>
3+
<RootNamespace>Morgania.CodeAnalysis.Editor</RootNamespace>
4+
<Description>The Roslyn-powered C# editor for Avalonia: VS-MEF composition plus the editor-host services (classification, squiggles, light bulb, key bridge, glyphs, refactoring dialogs) for the Morgania editor.</Description>
65
<IsPackable>true</IsPackable>
76
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7+
<!-- Morgania.CodeAnalysis.EditorFeatures defines the attribute and grants us internals. -->
8+
<IgnoresAccessChecksToOmitAttributeDefinition>true</IgnoresAccessChecksToOmitAttributeDefinition>
89
</PropertyGroup>
910
<ItemGroup>
10-
<ProjectReference Include="../RestoreHelper/RestoreHelper.csproj" Targets="GetLibReferences" PrivateAssets="All" />
11-
</ItemGroup>
12-
13-
<Target Name="GetLibReferences" AfterTargets="ResolveFrameworkReferences">
14-
<MSBuild Projects="@(ProjectReference->WithMetadataValue('Filename', 'RestoreHelper'))" Targets="GetLibReferences">
15-
<Output ItemName="LibReference" TaskParameter="TargetOutputs" />
16-
</MSBuild>
17-
<ItemGroup>
18-
<Reference Include="@(LibReference)" />
19-
<Content Include="@(LibReference)" PackagePath="lib/$(TargetFramework)" Pack="true" />
20-
</ItemGroup>
21-
</Target>
22-
23-
<ItemGroup>
11+
<PackageReference Include="Avalonia" />
2412
<PackageReference Include="IgnoresAccessChecksToGenerator" PrivateAssets="All" />
2513
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
2614
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
2715
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
2816
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
17+
<PackageReference Include="Microsoft.VisualStudio.Composition" />
2918
<PackageReference Include="Microsoft.VisualStudio.Threading" />
30-
<!-- <PackageReference Include="System.Reflection.Metadata" /> -->
3119
<PackageReference Include="System.Composition" />
32-
<!-- <PackageReference Include="System.Linq.AsyncEnumerable" /> -->
33-
<PackageReference Include="System.Reflection.MetadataLoadContext" />
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ProjectReference Include="../Morgania.CodeAnalysis.EditorFeatures/Morgania.CodeAnalysis.EditorFeatures.csproj" />
3423
</ItemGroup>
3524
<ItemGroup>
3625
<IgnoresAccessChecksTo Include="Microsoft.CodeAnalysis.CSharp" />
@@ -41,6 +30,5 @@
4130
<IgnoresAccessChecksTo Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
4231
<IgnoresAccessChecksTo Include="Microsoft.CodeAnalysis.Workspaces" />
4332
<IgnoresAccessChecksTo Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
44-
<IgnoresAccessChecksTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" />
4533
</ItemGroup>
4634
</Project>

‎src/RestoreHelper/RestoreHelper.csproj‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)