Skip to content

Commit 3190626

Browse files
vincentparrettvincentparrett
committed
Merge branch 'develop' into dpm-support
2 parents 9cb70c6 + 312f340 commit 3190626

File tree

73 files changed

+3105
-1751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3105
-1751
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.tvsconfig
1010
__history/
1111
__recovery/
12+
.vscode/
1213

1314
# Delphi Compiler output files
1415
*.dcu

‎Packages/Delphi10Sydney/Spring.Base.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetedPlatforms>3</TargetedPlatforms>
88
<AppType>Package</AppType>
99
<FrameworkType>None</FrameworkType>
10-
<ProjectVersion>19.1</ProjectVersion>
10+
<ProjectVersion>19.2</ProjectVersion>
1111
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

‎Packages/Delphi10Sydney/Spring.Core.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetedPlatforms>3</TargetedPlatforms>
88
<AppType>Package</AppType>
99
<FrameworkType>None</FrameworkType>
10-
<ProjectVersion>19.1</ProjectVersion>
10+
<ProjectVersion>19.2</ProjectVersion>
1111
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

‎Packages/Delphi10Sydney/Spring.Data.Designtime.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{74111A14-7F4C-484F-934C-5ED889C0D028}</ProjectGuid>
44
<MainSource>Spring.Data.Designtime.dpk</MainSource>
5-
<ProjectVersion>19.1</ProjectVersion>
5+
<ProjectVersion>19.2</ProjectVersion>
66
<Base>True</Base>
77
<Config Condition="'$(Config)'==''">Debug</Config>
88
<AppType>Package</AppType>

‎Packages/Delphi10Sydney/Spring.Data.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{CE604316-E7DF-4F7D-8C54-B06FAAB0F76B}</ProjectGuid>
44
<MainSource>Spring.Data.dpk</MainSource>
5-
<ProjectVersion>19.1</ProjectVersion>
5+
<ProjectVersion>19.2</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>

‎Packages/Delphi10Sydney/Spring.Extensions.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetedPlatforms>3</TargetedPlatforms>
88
<AppType>Package</AppType>
99
<FrameworkType>None</FrameworkType>
10-
<ProjectVersion>19.1</ProjectVersion>
10+
<ProjectVersion>19.2</ProjectVersion>
1111
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

‎Packages/Delphi10Sydney/Spring.Persistence.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetedPlatforms>3</TargetedPlatforms>
88
<AppType>Package</AppType>
99
<FrameworkType>None</FrameworkType>
10-
<ProjectVersion>19.1</ProjectVersion>
10+
<ProjectVersion>19.2</ProjectVersion>
1111
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

0 commit comments

Comments
 (0)