Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates vulnerable depencencies, removes some warnigs from CI/CD build #346

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.IO.Packaging" Version="9.0.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
<PackageVersion Include="bunit" Version="1.36.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.3.0" />
<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.3.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
Expand Down
20 changes: 20 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="gh-packages-ix-ax" value="https://nuget.pkg.github.com/ix-ax/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>

<packageSourceMapping>
<!-- Get AXSharp.* & AXOpen packages from ax -->
<packageSource key="gh-packages-ix-ax">
<package pattern="AXSharp.*"/>
<package pattern="AXOpen.*"/>
</packageSource>

<!-- Get all other packages from nuget.org -->
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
8 changes: 8 additions & 0 deletions cake/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ public sealed class ProvisionTask : FrostingTask<BuildContext>
{
public override void Run(BuildContext context)
{
context.DotNetBuildSettings.MSBuildSettings.Properties.Add("NoWarn", new List<string>()
{ "1234;2345;8602;10012;8618;0162;8605;1416;3270;1504;8600;8618;" +
"CS0618;CS1591;BL0007;BL0005;CA1416;CA2200;CS0105;CS0108;CS0109;CS0162;CS0168;CS0169;CS219;CS0414;CS0436;CS0472;CS0618;CS1591;CS1998;CS8604;" +
"CS8601;SYSLIB0051;SYSLIB0014;CS8625;CS0219;CS8625;CS8625;CS8620;RZ2012;RZ10012;CS4014;CS8981;CS8603;CS8766;CS8619;CS0649;CS8321"
});

ProvisionProjectWideTools(context);
}

Expand Down Expand Up @@ -119,6 +125,7 @@ public sealed class BuildTask : FrostingTask<BuildContext>
{
public override void Run(BuildContext context)
{

context.DotNetBuild(Path.Combine(context.ScrDir, "AXSharp.compiler\\src\\ixc\\AXSharp.ixc.csproj"), context.DotNetBuildSettings);

var axprojects = new List<string>()
Expand All @@ -137,6 +144,7 @@ public override void Run(BuildContext context)
foreach (var axproject in axprojects)
{
context.DotNetRunSettings.WorkingDirectory = Path.Combine(context.ScrDir, axproject);

context.DotNetRun(Path.Combine(context.ScrDir, "AXSharp.compiler\\src\\ixc\\AXSharp.ixc.csproj"), context.DotNetRunSettings);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="bunit"/>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="xunit"/>
<PackageReference Include="bunit" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.RegularExpressions" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web"/>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
<_ContentIncludedByDefault Remove="wwwroot\css\bootstrap\bootstrap.css.map" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\..\..\src\AXSharp.Presentation.Blazor.Controls\AXSharp.Presentation.Blazor.Controls.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoFixture"/>
<PackageReference Include="AutoFixture.AutoNSubstitute"/>
<PackageReference Include="AutoFixture" />
<PackageReference Include="AutoFixture.AutoNSubstitute" />
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions"/>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="NSubstitute"/>
<PackageReference Include="xunit"/>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.RegularExpressions" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Interactive"/>
<PackageReference Include="System.Interactive" />
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web"/>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ public partial class ix_integration_plcTwinController
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a tabs and grouped in group box")]
public Layouts.Tabbed.weather weather_tabbed { get; set; } = new Layouts.Tabbed.weather();

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

[ReadOnly()]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read only")]
public Layouts.Stacked.weather weather_readOnly { get; set; } = new Layouts.Stacked.weather();
public example test_example { get; set; } = new example();
Expand Down
24 changes: 0 additions & 24 deletions src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,44 +10,20 @@ public example()
{
}

[Container(Layout.Stack)]
public test_primitive primitives_stack { get; set; } = new test_primitive();

[Container(Layout.Wrap)]
public test_primitive primitives_wrap { get; set; } = new test_primitive();

[Container(Layout.Tabs)]
public test_primitive primitives_tabs { get; set; } = new test_primitive();

[Container(Layout.UniformGrid)]
public test_primitive primitives_uniform { get; set; } = new test_primitive();

[Container(Layout.Stack)]
[Group(GroupLayout.GroupBox)]
public test_primitive test_groupbox { get; set; } = new test_primitive();

[Container(Layout.Stack)]
[Group(GroupLayout.Border)]
public test_primitive test_border { get; set; } = new test_primitive();

[Container(Layout.Tabs)]
[Group(GroupLayout.GroupBox)]
public groupbox testgroupbox { get; set; } = new groupbox();
public border testborder { get; set; } = new border();
public ixcomponent ixcomponent_instance { get; set; } = new ixcomponent();
public MySecondNamespace.ixcomponent ixcomponent_instance2 { get; set; } = new MySecondNamespace.ixcomponent();
public ThirdNamespace.ixcomponent ixcomponent_instance3 { get; set; } = new ThirdNamespace.ixcomponent();

[Container(Layout.Stack)]
public compositeLayout compositeStack { get; set; } = new compositeLayout();

[Container(Layout.Wrap)]
public compositeLayout compositeWrap { get; set; } = new compositeLayout();

[Container(Layout.UniformGrid)]
public compositeLayout compositeUniform { get; set; } = new compositeLayout();

[Container(Layout.Tabs)]
public compositeLayout compositeTabs { get; set; } = new compositeLayout();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public Measurement()
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Minimum")]
public Single Min { get; set; }

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

Expand All @@ -32,23 +31,15 @@ public Measurements()
{
}

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

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

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

[Container(Layout.Tabs)]
[Group(GroupLayout.GroupBox)]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")]
public MeasurementExample.Measurement measurement_tabs { get; set; } = new MeasurementExample.Measurement();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,23 @@ public weatherBase()
public Single Longitude { get; set; }
public Single Altitude { get; set; }
public string Description { get; set; } = string.Empty;

[ReadOnly()]
public string LongDescription { get; set; } = string.Empty;

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

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

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

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

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

[RenderIgnore("Display", "ShadowDisplay")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Display'', ''ShadowDisplay'')]")]
public string RenderIgnoreWhenDisplayAndShadow { get; set; } = string.Empty;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ public MonsterBase()
public UInt64 Id { get; set; }
public Byte[] ArrayOfBytes { get; set; } = new Byte[4];
public MonsterData.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.DriveBase[4];

[IgnoreOnPocoOperation()]
public MonsterData.DriveBase DriveBase_tobeignoredbypocooperations { get; set; } = new MonsterData.DriveBase();

[IgnoreOnPocoOperation()]
public string Description_tobeignoredbypocooperations { get; set; } = string.Empty;
}

Expand Down
Loading