Skip to content

Commit 6360670

Browse files
authored
Merge pull request #44 from Synergex/net8
Merged in Jeff's .NET 8 changes in the .NET Core environment.
2 parents fcf28d8 + 8ddb41b commit 6360670

File tree

8 files changed

+1244
-1207
lines changed

8 files changed

+1244
-1207
lines changed

DotNetCore/CodeGenEngine/CodeGenEngine.synproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
<PlatformTarget>AnyCPU</PlatformTarget>
77
<ProjectGuid>{D2FC7695-E44F-48C0-A4A5-1E85B76EFA48}</ProjectGuid>
88
<EnableCommonProperties>True</EnableCommonProperties>
9+
<IgnoreCommonPropWarning>False</IgnoreCommonPropWarning>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Newtonsoft.Json">
1213
<Version>13.0.3</Version>
1314
</PackageReference>
1415
<PackageReference Include="Synergex.SynergyDE.Build">
15-
<Version>24.7.1696</Version>
16+
<Version>24.9.2004</Version>
1617
</PackageReference>
1718
<PackageReference Include="Synergex.SynergyDE.synrnt">
18-
<Version>12.3.1.1019</Version>
19+
<Version>12.4.1.1001</Version>
1920
</PackageReference>
2021
<PackageReference Include="Synergex.SynergyDE.synxml">
21-
<Version>12.3.1.1014</Version>
22+
<Version>12.4.1.1001</Version>
2223
</PackageReference>
2324
</ItemGroup>
2425
<ItemGroup>

DotNetCore/HarmonyCoreCodeGen.Core/HarmonyCoreCodeGen.Core.synproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<EnableDefaultItems>false</EnableDefaultItems>
77
<ProjectGuid>{6c94d108-0f08-4c31-a6a1-2f626df92caf}</ProjectGuid>
88
<Name>HarmonyCoreCodeGen.Core</Name>
9+
<IgnoreCommonPropWarning>False</IgnoreCommonPropWarning>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Microsoft.Build">
@@ -17,10 +18,10 @@
1718
<Version>1.7.8</Version>
1819
</PackageReference>
1920
<PackageReference Include="Synergex.SynergyDE.Build">
20-
<Version>24.7.1696</Version>
21+
<Version>24.9.2004</Version>
2122
</PackageReference>
2223
<PackageReference Include="Synergex.SynergyDE.synrnt">
23-
<Version>12.3.1.1019</Version>
24+
<Version>12.4.1.1001</Version>
2425
</PackageReference>
2526
</ItemGroup>
2627
<ItemGroup>

DotNetCore/HarmonyCoreExtensions/HarmonyCoreExtensions.synproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
<EnableDefaultItems>false</EnableDefaultItems>
77
<ProjectGuid>{1f68b271-629b-4c92-972f-ad384a91266c}</ProjectGuid>
88
<Name>HarmonyCoreExtensions</Name>
9+
<IgnoreCommonPropWarning>False</IgnoreCommonPropWarning>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Synergex.SynergyDE.Build">
12-
<Version>24.7.1696</Version>
13+
<Version>24.9.2004</Version>
1314
</PackageReference>
1415
<PackageReference Include="Synergex.SynergyDE.synrnt">
15-
<Version>12.3.1.1019</Version>
16+
<Version>12.4.1.1001</Version>
1617
</PackageReference>
1718
</ItemGroup>
1819
<ItemGroup>

DotNetCore/MethodCatalogAPI/MethodCatalogAPI.synproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
<PlatformTarget>AnyCPU</PlatformTarget>
77
<ProjectGuid>{D3564B19-4E1F-4C84-958C-1443FDAECF87}</ProjectGuid>
88
<EnableCommonProperties>True</EnableCommonProperties>
9+
<IgnoreCommonPropWarning>False</IgnoreCommonPropWarning>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Synergex.SynergyDE.Build">
12-
<Version>24.7.1696</Version>
13+
<Version>24.9.2004</Version>
1314
</PackageReference>
1415
<PackageReference Include="Synergex.SynergyDE.ddlib">
15-
<Version>12.3.1.1015</Version>
16+
<Version>12.4.1.1001</Version>
1617
</PackageReference>
1718
<PackageReference Include="Synergex.SynergyDE.synrnt">
18-
<Version>12.3.1.1019</Version>
19+
<Version>12.4.1.1001</Version>
1920
</PackageReference>
2021
<PackageReference Include="Synergex.SynergyDE.synxml">
21-
<Version>12.3.1.1014</Version>
22+
<Version>12.4.1.1001</Version>
2223
</PackageReference>
2324
</ItemGroup>
2425
<ItemGroup>

DotNetCore/RepositoryAPI/RepositoryAPI.synproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@
66
<PlatformTarget>AnyCPU</PlatformTarget>
77
<ProjectGuid>{7f590216-7da0-4662-988b-166c12a0ce1a}</ProjectGuid>
88
<EnableCommonProperties>True</EnableCommonProperties>
9+
<IgnoreCommonPropWarning>False</IgnoreCommonPropWarning>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Newtonsoft.Json">
1213
<Version>13.0.3</Version>
1314
</PackageReference>
1415
<PackageReference Include="Synergex.SynergyDE.Build">
15-
<Version>24.7.1696</Version>
16+
<Version>24.9.2004</Version>
1617
</PackageReference>
1718
<PackageReference Include="Synergex.SynergyDE.ddlib">
18-
<Version>12.3.1.1015</Version>
19+
<Version>12.4.1.1001</Version>
1920
</PackageReference>
2021
<PackageReference Include="Synergex.SynergyDE.synrnt">
21-
<Version>12.3.1.1019</Version>
22+
<Version>12.4.1.1001</Version>
2223
</PackageReference>
2324
<PackageReference Include="Synergex.SynergyDE.synxml">
24-
<Version>12.3.1.1014</Version>
25+
<Version>12.4.1.1001</Version>
2526
</PackageReference>
2627
</ItemGroup>
2728
<ItemGroup>

HarmonyCoreCodeGen.Core/Generator/ODataGenerator.dbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace HarmonyCoreGenerator.Generator
5555

5656
if (targetSolution.GeneratePostmanTests ?? false)
5757
begin
58-
result.Add(StructureTaskHelper(targetSolution, "Generate Postman tests", "", targetSolution.SolutionFolder, true, ^nameof(ODataGenerator), new string[#] { "ODataPostManTests" }, ^null))
58+
result.Add(StructureTaskHelper(targetSolution, "Generate OData Postman tests", "", targetSolution.SolutionFolder, true, ^nameof(ODataGenerator), new string[#] { "ODataPostManTests", "PostManDevelopmentEnvironment" }, ^null))
5959
end
6060

6161
;; Authentication

0 commit comments

Comments
 (0)