Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build & update Telerik

Browse Source
This commit is contained in:
Pascal
2024-01-22 09:45:32 +01:00
parent cf6353112a
commit 1be6200c58
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pilz.Configuration/Pilz.Configuration.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>Dranet8.0</TargetFrameworks> <TargetFrameworks>net8.0</TargetFrameworks>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,1591</NoWarn> <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,1591</NoWarn>
<DocumentationFile>Pilz.Configuration.xml</DocumentationFile> <DocumentationFile>Pilz.Configuration.xml</DocumentationFile>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>

15
Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
View File

@@ -1,26 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks> <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>2.4.0</Version> <Version>2.4.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="UI.for.WinForms.AllControls.Net60" Version="2023.2.718">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Pilz.UI.Telerik.SymbolFactory\Pilz.UI.Telerik.SymbolFactory.csproj" /> <ProjectReference Include="..\Pilz.UI.Telerik.SymbolFactory\Pilz.UI.Telerik.SymbolFactory.csproj" />
<ProjectReference Include="..\Pilz.UI.Telerik\Pilz.UI.Telerik.csproj" /> <ProjectReference Include="..\Pilz.UI.Telerik\Pilz.UI.Telerik.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
<Version>2023.3.1114</Version>
</PackageReference>
</ItemGroup>
</Project> </Project>

3
Pilz.UI.Telerik.SymbolFactory/Pilz.UI.Telerik.SymbolFactory.csproj
View File

@@ -12,8 +12,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="8.0.0" /> <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="UI.for.WinForms.AllControls.Net60"> <PackageReference Include="UI.for.WinForms.AllControls.Net60">
<Version>2023.2.718</Version> <Version>2023.3.1114</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

4
Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs generated
View File

@@ -29,8 +29,8 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlyoutDialogBase)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlyoutDialogBase));
radButton_Cancel = new Telerik.WinControls.UI.RadButton(); radButton_Cancel = new global::Telerik.WinControls.UI.RadButton();
radButton_Confirm = new Telerik.WinControls.UI.RadButton(); radButton_Confirm = new global::Telerik.WinControls.UI.RadButton();
tableLayoutPanel_ActionButtons = new TableLayoutPanel(); tableLayoutPanel_ActionButtons = new TableLayoutPanel();
((System.ComponentModel.ISupportInitialize)radButton_Cancel).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_Cancel).BeginInit();
((System.ComponentModel.ISupportInitialize)radButton_Confirm).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_Confirm).BeginInit();

3
Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
View File

@@ -11,8 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="UI.for.WinForms.AllControls.Net60"> <PackageReference Include="UI.for.WinForms.AllControls.Net60">
<Version>2023.2.718</Version> <Version>2023.3.1114</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>