Skip to content

Commit 29c3a7c

Browse files
PTKuPTKu
authored
Merge pull request #346 from ix-ax/update-dependencies
updates vulnerable depencencies, removes some warnigs from CI/CD build
2 parents ade4753 + 680da50 commit 29c3a7c

File tree

16 files changed

+69
-63
lines changed

16 files changed

+69
-63
lines changed

‎Directory.Packages.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,16 @@
3131
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
3232
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
3333
<PackageVersion Include="System.IO.Packaging" Version="9.0.0" />
34+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
35+
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
3436
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
37+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
3538
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
3639
<PackageVersion Include="bunit" Version="1.36.0" />
3740
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
3841
<PackageVersion Include="xunit" Version="2.9.2" />
3942
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
40-
<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.3.0" />
43+
<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.3.0" />
4144
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
4245
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
4346
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />

‎NuGet.config

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="gh-packages-ix-ax" value="https://nuget.pkg.github.com/ix-ax/index.json" />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
8+
<packageSourceMapping>
9+
<!-- Get AXSharp.* & AXOpen packages from ax -->
10+
<packageSource key="gh-packages-ix-ax">
11+
<package pattern="AXSharp.*"/>
12+
<package pattern="AXOpen.*"/>
13+
</packageSource>
14+
15+
<!-- Get all other packages from nuget.org -->
16+
<packageSource key="nuget.org">
17+
<package pattern="*" />
18+
</packageSource>
19+
</packageSourceMapping>
20+
</configuration>

‎cake/Program.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ public sealed class ProvisionTask : FrostingTask<BuildContext>
8383
{
8484
public override void Run(BuildContext context)
8585
{
86+
context.DotNetBuildSettings.MSBuildSettings.Properties.Add("NoWarn", new List<string>()
87+
{ "1234;2345;8602;10012;8618;0162;8605;1416;3270;1504;8600;8618;" +
88+
"CS0618;CS1591;BL0007;BL0005;CA1416;CA2200;CS0105;CS0108;CS0109;CS0162;CS0168;CS0169;CS219;CS0414;CS0436;CS0472;CS0618;CS1591;CS1998;CS8604;" +
89+
"CS8601;SYSLIB0051;SYSLIB0014;CS8625;CS0219;CS8625;CS8625;CS8620;RZ2012;RZ10012;CS4014;CS8981;CS8603;CS8766;CS8619;CS0649;CS8321"
90+
});
91+
8692
ProvisionProjectWideTools(context);
8793
}
8894

@@ -119,6 +125,7 @@ public sealed class BuildTask : FrostingTask<BuildContext>
119125
{
120126
public override void Run(BuildContext context)
121127
{
128+
122129
context.DotNetBuild(Path.Combine(context.ScrDir, "AXSharp.compiler\\src\\ixc\\AXSharp.ixc.csproj"), context.DotNetBuildSettings);
123130

124131
var axprojects = new List<string>()
@@ -137,6 +144,7 @@ public override void Run(BuildContext context)
137144
foreach (var axproject in axprojects)
138145
{
139146
context.DotNetRunSettings.WorkingDirectory = Path.Combine(context.ScrDir, axproject);
147+
140148
context.DotNetRun(Path.Combine(context.ScrDir, "AXSharp.compiler\\src\\ixc\\AXSharp.ixc.csproj"), context.DotNetRunSettings);
141149
}
142150

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@
8282
</ItemGroup>
8383

8484
<ItemGroup>
85-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
85+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
86+
<PackageReference Include="System.Net.Http" />
87+
<PackageReference Include="System.Text.Encodings.Web" />
88+
<PackageReference Include="System.Text.RegularExpressions" />
8689
</ItemGroup>
8790

8891
<ItemGroup>

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor/AXSharp.Presentation.Blazor.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@
6060
</ItemGroup>
6161

6262
<ItemGroup>
63-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions"/>
64-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
63+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
64+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
65+
<PackageReference Include="System.Net.Http" />
66+
<PackageReference Include="System.Text.Encodings.Web" />
67+
<PackageReference Include="System.Text.RegularExpressions" />
6568
</ItemGroup>
6669

6770
<ItemGroup>

‎src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/AXSharp.RenderableContent.Tests.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="bunit"/>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
12-
<PackageReference Include="xunit"/>
10+
<PackageReference Include="bunit" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="System.Net.Http" />
13+
<PackageReference Include="System.Text.Encodings.Web" />
14+
<PackageReference Include="System.Text.RegularExpressions" />
15+
<PackageReference Include="xunit" />
1316
<PackageReference Include="xunit.runner.visualstudio">
1417
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1518
<PrivateAssets>all</PrivateAssets>

‎src/AXSharp.blazor/tests/sandbox/ComponentsExamples/ComponentsExamples.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Components.Web"/>
15+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
16+
<PackageReference Include="System.Net.Http" />
17+
<PackageReference Include="System.Text.Encodings.Web" />
18+
<PackageReference Include="System.Text.RegularExpressions" />
1619
</ItemGroup>
1720

1821
<ItemGroup>

‎src/AXSharp.blazor/tests/sandbox/IxBlazor.App/IxBlazor.App.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<_ContentIncludedByDefault Remove="wwwroot\css\bootstrap\bootstrap.css.map" />
1212
</ItemGroup>
1313

14+
<ItemGroup>
15+
<PackageReference Include="System.Net.Http" />
16+
<PackageReference Include="System.Text.Encodings.Web" />
17+
<PackageReference Include="System.Text.RegularExpressions" />
18+
</ItemGroup>
19+
1420

1521
<ItemGroup>
1622
<ProjectReference Include="..\..\..\src\AXSharp.Presentation.Blazor.Controls\AXSharp.Presentation.Blazor.Controls.csproj" />

‎src/AXSharp.tools/tests/AXSharp.nuget.update.Tests/AXSharp.nuget.update.Tests.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="AutoFixture"/>
10-
<PackageReference Include="AutoFixture.AutoNSubstitute"/>
9+
<PackageReference Include="AutoFixture" />
10+
<PackageReference Include="AutoFixture.AutoNSubstitute" />
1111
<PackageReference Include="coverlet.collector">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="FluentAssertions"/>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
17-
<PackageReference Include="NSubstitute"/>
18-
<PackageReference Include="xunit"/>
15+
<PackageReference Include="FluentAssertions" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
17+
<PackageReference Include="NSubstitute" />
18+
<PackageReference Include="System.Net.Http" />
19+
<PackageReference Include="System.Text.RegularExpressions" />
20+
<PackageReference Include="xunit" />
1921
<PackageReference Include="xunit.runner.visualstudio">
2022
<PrivateAssets>all</PrivateAssets>
2123
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/sanbox/integration/ix-integration-blazor/ix-integration-blazor.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="System.Interactive"/>
11+
<PackageReference Include="System.Interactive" />
12+
<PackageReference Include="System.Text.Encodings.Web" />
1213
</ItemGroup>
1314

1415
<ItemGroup>

‎src/sanbox/integration/ix-integration-library/ix-integration-library.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Components.Web"/>
16+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
17+
<PackageReference Include="System.Text.Encodings.Web" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ public partial class ix_integration_plcTwinController
2020
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a tabs and grouped in group box")]
2121
public Layouts.Tabbed.weather weather_tabbed { get; set; } = new Layouts.Tabbed.weather();
2222

23-
[ReadOnce()]
2423
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read once")]
2524
public Layouts.Stacked.weather weather_readOnce { get; set; } = new Layouts.Stacked.weather();
2625

27-
[ReadOnly()]
2826
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read only")]
2927
public Layouts.Stacked.weather weather_readOnly { get; set; } = new Layouts.Stacked.weather();
3028
public example test_example { get; set; } = new example();

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,20 @@ public example()
1010
{
1111
}
1212

13-
[Container(Layout.Stack)]
1413
public test_primitive primitives_stack { get; set; } = new test_primitive();
15-
16-
[Container(Layout.Wrap)]
1714
public test_primitive primitives_wrap { get; set; } = new test_primitive();
18-
19-
[Container(Layout.Tabs)]
2015
public test_primitive primitives_tabs { get; set; } = new test_primitive();
21-
22-
[Container(Layout.UniformGrid)]
2316
public test_primitive primitives_uniform { get; set; } = new test_primitive();
24-
25-
[Container(Layout.Stack)]
26-
[Group(GroupLayout.GroupBox)]
2717
public test_primitive test_groupbox { get; set; } = new test_primitive();
28-
29-
[Container(Layout.Stack)]
30-
[Group(GroupLayout.Border)]
3118
public test_primitive test_border { get; set; } = new test_primitive();
32-
33-
[Container(Layout.Tabs)]
34-
[Group(GroupLayout.GroupBox)]
3519
public groupbox testgroupbox { get; set; } = new groupbox();
3620
public border testborder { get; set; } = new border();
3721
public ixcomponent ixcomponent_instance { get; set; } = new ixcomponent();
3822
public MySecondNamespace.ixcomponent ixcomponent_instance2 { get; set; } = new MySecondNamespace.ixcomponent();
3923
public ThirdNamespace.ixcomponent ixcomponent_instance3 { get; set; } = new ThirdNamespace.ixcomponent();
40-
41-
[Container(Layout.Stack)]
4224
public compositeLayout compositeStack { get; set; } = new compositeLayout();
43-
44-
[Container(Layout.Wrap)]
4525
public compositeLayout compositeWrap { get; set; } = new compositeLayout();
46-
47-
[Container(Layout.UniformGrid)]
4826
public compositeLayout compositeUniform { get; set; } = new compositeLayout();
49-
50-
[Container(Layout.Tabs)]
5127
public compositeLayout compositeTabs { get; set; } = new compositeLayout();
5228
}
5329
}

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public Measurement()
1515
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Minimum")]
1616
public Single Min { get; set; }
1717

18-
[ReadOnly()]
1918
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measured")]
2019
public Single Acquired { get; set; }
2120

@@ -32,23 +31,15 @@ public Measurements()
3231
{
3332
}
3433

35-
[Container(Layout.Stack)]
36-
[Group(GroupLayout.GroupBox)]
3734
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Stack panel")]
3835
public MeasurementExample.Measurement measurement_stack { get; set; } = new MeasurementExample.Measurement();
3936

40-
[Container(Layout.Wrap)]
41-
[Group(GroupLayout.GroupBox)]
4237
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Wrap panel")]
4338
public MeasurementExample.Measurement measurement_wrap { get; set; } = new MeasurementExample.Measurement();
4439

45-
[Container(Layout.UniformGrid)]
46-
[Group(GroupLayout.GroupBox)]
4740
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Grid")]
4841
public MeasurementExample.Measurement measurement_grid { get; set; } = new MeasurementExample.Measurement();
4942

50-
[Container(Layout.Tabs)]
51-
[Group(GroupLayout.GroupBox)]
5243
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")]
5344
public MeasurementExample.Measurement measurement_tabs { get; set; } = new MeasurementExample.Measurement();
5445
}

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weatherBase.g.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,23 @@ public weatherBase()
1414
public Single Longitude { get; set; }
1515
public Single Altitude { get; set; }
1616
public string Description { get; set; } = string.Empty;
17-
18-
[ReadOnly()]
1917
public string LongDescription { get; set; } = string.Empty;
2018

21-
[ReadOnce()]
2219
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "this has [ReadOnce()] attribute will be readon only once...")]
2320
public Int16 StartCounter { get; set; }
2421

25-
[RenderIgnore()]
2622
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore()] must not be displayed!")]
2723
public string RenderIgnoreAllToghether { get; set; } = string.Empty;
2824

29-
[RenderIgnore("Control")]
3025
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Control'')]")]
3126
public string RenderIgnoreWhenControl { get; set; } = string.Empty;
3227

33-
[RenderIgnore("Display")]
3428
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Display'')]")]
3529
public string RenderIgnoreWhenDisplay { get; set; } = string.Empty;
3630

37-
[RenderIgnore("Control", "ShadowControl")]
3831
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Control'', ''ShadowControl'')]")]
3932
public string RenderIgnoreWhenControlAndShadow { get; set; } = string.Empty;
4033

41-
[RenderIgnore("Display", "ShadowDisplay")]
4234
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Display'', ''ShadowDisplay'')]")]
4335
public string RenderIgnoreWhenDisplayAndShadow { get; set; } = string.Empty;
4436
}

‎src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ public MonsterBase()
1919
public UInt64 Id { get; set; }
2020
public Byte[] ArrayOfBytes { get; set; } = new Byte[4];
2121
public MonsterData.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.DriveBase[4];
22-
23-
[IgnoreOnPocoOperation()]
2422
public MonsterData.DriveBase DriveBase_tobeignoredbypocooperations { get; set; } = new MonsterData.DriveBase();
25-
26-
[IgnoreOnPocoOperation()]
2723
public string Description_tobeignoredbypocooperations { get; set; } = string.Empty;
2824
}
2925

0 commit comments

Comments
 (0)