Skip to content

Commit 7a2f611

Browse files
lahmalahma
authored
Upgrade packages (#251)
1 parent 1f628dd commit 7a2f611

8 files changed

+28
-38
lines changed

‎Spring.Net.sln.DotSettings

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* limitations under the License.
2222
*/</s:String>
2323
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
24+
<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" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
2425
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
2526
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
2627
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -68,4 +69,5 @@
6869
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
6970
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
7071
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
71-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
72+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
73+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎build-support/nuke-build/_build.csproj.DotSettings

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
1717
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
1818
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
19+
<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" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
20+
<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" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
1921
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
2022
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
2123
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -24,4 +26,5 @@
2426
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
2527
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
2628
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
27-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
29+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
30+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎examples/Directory.Build.props

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1818
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1919

20-
<CommonLoggingVersion>3.4.1</CommonLoggingVersion>
21-
2220
<Authors>SpringSource</Authors>
2321
<PackageIconUrl>http://springframework.net/images/SpringSource_Leaves32x32.png</PackageIconUrl>
2422
<PackageLicenseUrl>http://www.springframework.net/license.html</PackageLicenseUrl>
@@ -27,7 +25,7 @@
2725

2826
<NeutralLanguage>en-US</NeutralLanguage>
2927
<WarningsAsErrors>True</WarningsAsErrors>
30-
<NoWarn>1574,1584,1591</NoWarn>
28+
<NoWarn>1574,1584,1591</NoWarn>
3129

3230
<RepositoryType>git</RepositoryType>
3331
<RepositoryUrl>https://github.com/spring-projects/spring-net</RepositoryUrl>

‎examples/Directory.Packages.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<ItemGroup>
66
<PackageVersion Include="Apache.NMS" Version="2.0.0" />
77
<PackageVersion Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
8-
<PackageVersion Include="Common.Logging" Version="$(CommonLoggingVersion)" />
8+
<PackageVersion Include="Common.Logging" Version="3.4.1" />
99
<PackageVersion Include="Common.Logging.Log4Net1213" Version="3.4.1" />
1010
<PackageVersion Include="Common.Logging.Log4Net1215" Version="3.4.1" />
1111
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
12-
<PackageVersion Include="NUnit" Version="3.13.3" />
13-
<PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
12+
<PackageVersion Include="NUnit" Version="3.14.0" />
13+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
1414
</ItemGroup>
1515
</Project>

‎src/Directory.Build.props

-6
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
<Copyright>Copyright 2002-2021 Spring.NET Framework Team.</Copyright>
1919
<Trademark>Apache License, Version 2.0</Trademark>
2020

21-
<CommonLoggingVersion>3.4.1</CommonLoggingVersion>
22-
2321
<Authors>SpringSource</Authors>
2422
<PackageIcon>SpringSource_Leaves32x32.png</PackageIcon>
2523
<PackageIconUrl>https://springframework.net/images/SpringSource_Leaves32x32.png</PackageIconUrl>
@@ -49,10 +47,6 @@
4947

5048
</PropertyGroup>
5149

52-
<ItemGroup Condition="'$(SourceLinkEnabled)' != 'false'">
53-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
54-
</ItemGroup>
55-
5650
<ItemGroup>
5751
<PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="All" />
5852
</ItemGroup>

‎src/Directory.Packages.props

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5-
<ItemGroup Condition="'$(SourceLinkEnabled)' != 'false'">
6-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7-
</ItemGroup>
85
<ItemGroup>
96
<PackageVersion Include="Antlr3.Runtime" Version="3.5.1" />
107
<PackageVersion Include="Apache.NMS" Version="2.0.0" />
118
<PackageVersion Include="Castle.NVelocity" Version="1.1.1" />
12-
<PackageVersion Include="Common.Logging" Version="$(CommonLoggingVersion)" />
9+
<PackageVersion Include="Common.Logging" Version="3.4.1" />
1310
<PackageVersion Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" />
1411
<PackageVersion Include="Experimental.System.Messaging.Signed" Version="1.0.0" />
1512
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
@@ -18,11 +15,11 @@
1815
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1916
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
2017
<PackageVersion Include="MSTest.TestFramework" Version="2.1.2" />
21-
<PackageVersion Include="NHibernate" Version="5.3.5" />
22-
<PackageVersion Include="NUnit" Version="3.13.3" />
18+
<PackageVersion Include="NHibernate" Version="5.5.2" />
19+
<PackageVersion Include="NUnit" Version="3.14.0" />
2320
<PackageVersion Include="NVelocity" Version="1.2.0" />
2421
<PackageVersion Include="Quartz" Version="3.2.3" />
25-
<PackageVersion Include="System.CodeDom" Version="4.7.0" />
22+
<PackageVersion Include="System.CodeDom" Version="5.0.0" />
2623
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
2724
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
2825
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />

‎test/Directory.Build.props

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1414
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1515

16-
<ApacheNmsVersion>2.0.0</ApacheNmsVersion>
17-
<CommonLoggingVersion>3.4.1</CommonLoggingVersion>
18-
<Log4NetVersion>2.0.8</Log4NetVersion>
19-
2016
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
2117
<ComVisible>False</ComVisible>
2218
<DebugSymbols>True</DebugSymbols>

‎test/Directory.Packages.props

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Apache.NMS" Version="$(ApacheNmsVersion)" />
6+
<PackageVersion Include="Apache.NMS" Version="2.0.0" />
77
<PackageVersion Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
8-
<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
9-
<PackageVersion Include="FakeItEasy" Version="7.3.1" />
10-
<PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.1.0" />
11-
<PackageVersion Include="log4net" Version="2.0.12" />
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13-
<PackageVersion Include="MSTest.TestAdapter" Version="2.1.2" />
14-
<PackageVersion Include="MSTest.TestFramework" Version="2.1.2" />
15-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
16-
<PackageVersion Include="NUnit" Version="3.13.3" />
17-
<PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
8+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
9+
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
10+
<PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
11+
<PackageVersion Include="log4net" Version="2.0.17" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
13+
<PackageVersion Include="MSTest.TestAdapter" Version="3.4.3" />
14+
<PackageVersion Include="MSTest.TestFramework" Version="3.4.3" />
15+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
16+
<PackageVersion Include="NUnit" Version="3.14.0" />
17+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
1818
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
19-
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.113.7" />
20-
<PackageVersion Include="System.Resources.Extensions" Version="5.0.0" />
19+
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.118" />
20+
<PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
2121
</ItemGroup>
2222
</Project>

0 commit comments

Comments
 (0)