Skip to content

Commit c172f90

Browse files
r-koubour-koubou
authored
Merge pull request #77 from r-koubou/refactor/migrate-to-net10
Migrate to net10
2 parents f269cd5 + 7525cf7 commit c172f90

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

‎KeySwitchManager/.idea/.idea.KeySwitchManager/.idea/projectSettingsUpdater.xml‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎KeySwitchManager/KeySwitchManager.sln.DotSettings‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,15 @@
326326
&lt;/Patterns&gt;</s:String>
327327
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
328328
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
329+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
330+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
329331
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
330332
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
331333
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
334+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
332335
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
333336
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
337+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
334338
<s:Boolean x:Key="/Default/UserDictionary/Words/=artmap/@EntryIndexedValue">True</s:Boolean>
335339
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cubase/@EntryIndexedValue">True</s:Boolean>
336340
<s:Boolean x:Key="/Default/UserDictionary/Words/=Daw/@EntryIndexedValue">False</s:Boolean>

‎KeySwitchManager/Sources/Runtime/Applications/CLI/Applications.CLI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<PropertyGroup>
44
<!-- Assembly / Common -->
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net7.0</TargetFramework>
76
<AssemblyName>KeySwitchManager</AssemblyName>
87
<RootNamespace>KeySwitchManager.Applications.CLI</RootNamespace>
98
<Company>R-Koubou</Company>
109
<Product>KeySwitchManager CLI Application</Product>
1110
<Version>0.5.3</Version>
1211
<Description>KeySwitchManager CLI Application</Description>
1312
<Nullable>enable</Nullable>
13+
<TargetFramework>net10.0</TargetFramework>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

‎KeySwitchManager/Sources/Runtime/Applications/CLI/Applications.CLI.csproj.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@
328328
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
329329
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
330330
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
331+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
331332
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
332333
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
333334
<s:Boolean x:Key="/Default/UserDictionary/Words/=artmap/@EntryIndexedValue">True</s:Boolean>

‎KeySwitchManager/Sources/Runtime/Applications/CLI/GenerateLauncher.msbuild‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ dotnet %~dp0\$(AssemblyName).dll %*
1616
</PropertyGroup>
1717

1818
<WriteLinesToFile
19-
File="$(OutDir)/ksm.sh"
19+
File="$(OutputPath)/ksm.sh"
2020
Overwrite="true"
2121
Lines="$(BashLauncherText)"/>
2222

2323
<WriteLinesToFile
24-
File="$(OutDir)/ksm.bat"
24+
File="$(OutputPath)/ksm.bat"
2525
Overwrite="true"
2626
Lines="$(DosLauncherText)"/>
2727

‎KeySwitchManager/Sources/Runtime/Applications/CLI/publish.sh‎

100644100755
File mode changed.

‎KeySwitchManager/Sources/Runtime/Applications/WPF/Applications.WPF.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows</TargetFramework>
5+
<TargetFramework>net10.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<AssemblyName>KeySwitchManager</AssemblyName>
88
<RootNamespace>KeySwitchManager.Applications.WPF</RootNamespace>

0 commit comments

Comments
 (0)