Skip to content

Commit 923dbf7

Browse files
codingsebcodingseb
committed
Compile on my Windows 11
1 parent 79d4dd3 commit 923dbf7

File tree

6 files changed

+74
-70
lines changed

6 files changed

+74
-70
lines changed

‎CSharpRegexTools4Npp/CSharpRegexTools4Npp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@
135135
</None>
136136
</ItemGroup>
137137
<ItemGroup>
138+
<Content Include="PluginInfrastructure\DllExport\Mono.Cecil.dll" />
139+
<Content Include="PluginInfrastructure\DllExport\NppPlugin.DllExport.dll" />
140+
<Content Include="PluginInfrastructure\DllExport\NppPlugin.DllExport.MSBuild.dll" />
138141
<Resource Include="FodyWeavers.xml">
139142
<SubType>Designer</SubType>
140143
</Resource>

‎RegexDialog/FodyWeavers.xsd

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,55 @@
44
<xs:element name="Weavers">
55
<xs:complexType>
66
<xs:all>
7+
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
10+
<xs:annotation>
11+
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
12+
</xs:annotation>
13+
</xs:attribute>
14+
<xs:attribute name="TriggerDependentProperties" type="xs:boolean">
15+
<xs:annotation>
16+
<xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
17+
</xs:annotation>
18+
</xs:attribute>
19+
<xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
20+
<xs:annotation>
21+
<xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
22+
</xs:annotation>
23+
</xs:attribute>
24+
<xs:attribute name="EventInvokerNames" type="xs:string">
25+
<xs:annotation>
26+
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
27+
</xs:annotation>
28+
</xs:attribute>
29+
<xs:attribute name="CheckForEquality" type="xs:boolean">
30+
<xs:annotation>
31+
<xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
32+
</xs:annotation>
33+
</xs:attribute>
34+
<xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
35+
<xs:annotation>
36+
<xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
37+
</xs:annotation>
38+
</xs:attribute>
39+
<xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
40+
<xs:annotation>
41+
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
42+
</xs:annotation>
43+
</xs:attribute>
44+
<xs:attribute name="SuppressWarnings" type="xs:boolean">
45+
<xs:annotation>
46+
<xs:documentation>Used to turn off build warnings from this weaver.</xs:documentation>
47+
</xs:annotation>
48+
</xs:attribute>
49+
<xs:attribute name="SuppressOnPropertyNameChangedWarning" type="xs:boolean">
50+
<xs:annotation>
51+
<xs:documentation>Used to turn off build warnings about mismatched On_PropertyName_Changed methods.</xs:documentation>
52+
</xs:annotation>
53+
</xs:attribute>
54+
</xs:complexType>
55+
</xs:element>
756
<xs:element name="Costura" minOccurs="0" maxOccurs="1">
857
<xs:complexType>
958
<xs:all>
@@ -120,55 +169,6 @@
120169
</xs:attribute>
121170
</xs:complexType>
122171
</xs:element>
123-
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
124-
<xs:complexType>
125-
<xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
126-
<xs:annotation>
127-
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
128-
</xs:annotation>
129-
</xs:attribute>
130-
<xs:attribute name="TriggerDependentProperties" type="xs:boolean">
131-
<xs:annotation>
132-
<xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
133-
</xs:annotation>
134-
</xs:attribute>
135-
<xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
136-
<xs:annotation>
137-
<xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
138-
</xs:annotation>
139-
</xs:attribute>
140-
<xs:attribute name="EventInvokerNames" type="xs:string">
141-
<xs:annotation>
142-
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
143-
</xs:annotation>
144-
</xs:attribute>
145-
<xs:attribute name="CheckForEquality" type="xs:boolean">
146-
<xs:annotation>
147-
<xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
148-
</xs:annotation>
149-
</xs:attribute>
150-
<xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
151-
<xs:annotation>
152-
<xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
153-
</xs:annotation>
154-
</xs:attribute>
155-
<xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
156-
<xs:annotation>
157-
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
158-
</xs:annotation>
159-
</xs:attribute>
160-
<xs:attribute name="SuppressWarnings" type="xs:boolean">
161-
<xs:annotation>
162-
<xs:documentation>Used to turn off build warnings from this weaver.</xs:documentation>
163-
</xs:annotation>
164-
</xs:attribute>
165-
<xs:attribute name="SuppressOnPropertyNameChangedWarning" type="xs:boolean">
166-
<xs:annotation>
167-
<xs:documentation>Used to turn off build warnings about mismatched On_PropertyName_Changed methods.</xs:documentation>
168-
</xs:annotation>
169-
</xs:attribute>
170-
</xs:complexType>
171-
</xs:element>
172172
</xs:all>
173173
<xs:attribute name="VerifyAssembly" type="xs:boolean">
174174
<xs:annotation>

‎RegexDialog/RegExToolDialog.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ private void Init()
272272
.ReferenceAssemblyByName("System.Windows.Forms")
273273
.ReferenceAssemblyByName("Ookii.dialogs.Wpf")
274274
.ReferenceAssemblyByName("Newtonsoft.Json")
275-
.ReferenceAssemblyByName("EPPlus");
275+
.ReferenceAssemblyByName("ClosedXML");
276276

277277
RegexEditor.Text = Config.Instance.RegexEditorText;
278278

‎RegexDialog/RegexDialog.GeneratedMSBuildEditorConfig.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
is_global = true
2+
build_property.PropertyChangedAnalyzerConfiguration =
23
build_property.TargetFramework =
34
build_property.TargetPlatformMinVersion =
45
build_property.UsingMicrosoftNETSdkWeb =

‎RegexDialog/RegexDialog.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\PropertyChanged.Fody.4.1.0\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.4.1.0\build\PropertyChanged.Fody.props')" />
34
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" />
45
<Import Project="..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props')" />
56
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
6-
<Import Project="..\packages\PropertyChanged.Fody.3.3.1\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.3.3.1\build\PropertyChanged.Fody.props')" />
77
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
88
<PropertyGroup>
99
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -131,8 +131,8 @@
131131
</Reference>
132132
<Reference Include="PresentationCore" />
133133
<Reference Include="PresentationFramework" />
134-
<Reference Include="PropertyChanged, Version=3.3.1.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
135-
<HintPath>..\packages\PropertyChanged.Fody.3.3.1\lib\net40\PropertyChanged.dll</HintPath>
134+
<Reference Include="PropertyChanged, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
135+
<HintPath>..\packages\PropertyChanged.Fody.4.1.0\lib\net40\PropertyChanged.dll</HintPath>
136136
</Reference>
137137
<Reference Include="SixLabors.Fonts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
138138
<HintPath>..\packages\SixLabors.Fonts.1.0.0\lib\netstandard2.0\SixLabors.Fonts.dll</HintPath>
@@ -146,8 +146,8 @@
146146
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
147147
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
148148
</Reference>
149-
<Reference Include="System.Collections.Immutable, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
150-
<HintPath>..\packages\System.Collections.Immutable.5.0.0\lib\net461\System.Collections.Immutable.dll</HintPath>
149+
<Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
150+
<HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
151151
</Reference>
152152
<Reference Include="System.ComponentModel.Composition" />
153153
<Reference Include="System.configuration" />
@@ -219,8 +219,8 @@
219219
<Private>True</Private>
220220
<Private>True</Private>
221221
</Reference>
222-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
223-
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
222+
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
223+
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
224224
</Reference>
225225
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
226226
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
@@ -241,8 +241,8 @@
241241
<Private>True</Private>
242242
<Private>True</Private>
243243
</Reference>
244-
<Reference Include="System.Reflection.Metadata, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
245-
<HintPath>..\packages\System.Reflection.Metadata.5.0.0\lib\net461\System.Reflection.Metadata.dll</HintPath>
244+
<Reference Include="System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
245+
<HintPath>..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll</HintPath>
246246
</Reference>
247247
<Reference Include="System.Resources.Extensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
248248
<HintPath>..\packages\System.Resources.Extensions.6.0.0\lib\net461\System.Resources.Extensions.dll</HintPath>
@@ -252,8 +252,8 @@
252252
<Private>True</Private>
253253
<Private>True</Private>
254254
</Reference>
255-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
256-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
255+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
256+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
257257
</Reference>
258258
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
259259
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
@@ -287,8 +287,8 @@
287287
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
288288
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
289289
</Reference>
290-
<Reference Include="System.Text.Encoding.CodePages, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
291-
<HintPath>..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
290+
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
291+
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
292292
</Reference>
293293
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
294294
<HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
@@ -526,13 +526,13 @@
526526
<PropertyGroup>
527527
<ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
528528
</PropertyGroup>
529-
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.3.3.1\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.3.3.1\build\PropertyChanged.Fody.props'))" />
530529
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
531530
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
532531
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props'))" />
533532
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
534533
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
535534
<Error Condition="!Exists('..\packages\Fody.6.8.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.0\build\Fody.targets'))" />
535+
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.4.1.0\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.4.1.0\build\PropertyChanged.Fody.props'))" />
536536
</Target>
537537
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
538538
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />

0 commit comments

Comments
 (0)