Skip to content

Commit c722daf

Browse files
committed
refs
1 parent 21fd1bc commit c722daf

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

src/.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ resharper_field_can_be_made_read_only_local_highlighting = none
200200
resharper_merge_into_logical_pattern_highlighting = warning
201201
resharper_merge_into_pattern_highlighting = error
202202
resharper_method_has_async_overload_highlighting = warning
203-
resharper_partial_type_with_single_part_highlighting = error
203+
resharper_partial_type_with_single_part_highlighting = warning
204204
resharper_redundant_base_qualifier_highlighting = warning
205205
resharper_redundant_cast_highlighting = error
206206
resharper_redundant_empty_object_creation_argument_list_highlighting = error

src/DiffEngine/DiffEngine.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<PackageReference Include="Caseless.Fody" PrivateAssets="All" />
1616
<PackageReference Include="EmptyFiles" PrivateAssets="None" />
1717
<PackageReference Include="Fody" PrivateAssets="all" />
18-
<PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFramework)' != 'net8.0'" />
18+
<PackageReference Include="System.Collections.Immutable"
19+
Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'" />
1920
<PackageReference Include="Polyfill" PrivateAssets="all" />
2021
<PackageReference Include="System.Management" />
2122
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />

src/Directory.Packages.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<PackageVersion Include="Serilog" Version="4.1.0" />
1717
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
1818
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
19+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
20+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
21+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
22+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
1923
<PackageVersion Include="System.Globalization.Extensions" Version="4.3.0" />
2024
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
2125
<PackageVersion Include="System.Management" Version="9.0.0" />
@@ -25,7 +29,7 @@
2529
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
2630
<PackageVersion Include="Verify.ImageMagick" Version="3.6.0" />
2731
<PackageVersion Include="Verify.WinForms" Version="4.0.0" />
28-
<PackageVersion Include="Verify.Xunit" Version="28.2.0" />
32+
<PackageVersion Include="Verify.Xunit" Version="28.2.1" />
2933
<PackageVersion Include="Xunit" Version="2.9.2" />
3034
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49" />
3135
<PackageVersion Include="XunitContext" Version="3.3.2" />

src/Shared.sln.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/Environment/Hierarchy/Build/SolutionBuilderNext/LogToFile/@EntryValue">False</s:Boolean>
3+
<s:String x:Key="/Default/Environment/Hierarchy/Build/SolutionBuilderNext/OutputVerbosityLevel/@EntryValue">Quiet</s:String>
24
<s:Boolean x:Key="/Default/CodeEditing/ContextActionTable/DisabledContextActions/=JetBrains_002EReSharper_002EIntentions_002ECSharp_002EContextActions_002EUseConfigureAwaitFalseAction/@EntryIndexedValue">True</s:Boolean>
35
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002AMigrations_002A/@EntryIndexedValue">True</s:Boolean>
46
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002EDesigner_002Ecs/@EntryIndexedValue">True</s:Boolean>

src/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.2.24474.11",
3+
"version": "9.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}

0 commit comments

Comments
 (0)