Skip to content

Commit 989598d

Browse files
jogibear9988jogibear9988
authored
Merge pull request #246 from CMor1184/TIA_V21_readiness
Tia v21 readiness
2 parents 52c3a03 + cc32fc7 commit 989598d

File tree

78 files changed

+157086
-146
lines changed

Some content is hidden

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

78 files changed

+157086
-146
lines changed

‎BackupRestoreBlocks/BackupRestoreBlocks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>

‎DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2-
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net462</TargetFramework>
6-
<UseWindowsForms>true</UseWindowsForms>
7-
<UseWPF>true</UseWPF>
8-
<RootNamespace>DotNetSimaticDatabaseProtokollerConfigurationTool</RootNamespace>
9-
<ApplicationManifest>app.manifest</ApplicationManifest>
10-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
11-
</PropertyGroup>
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net462</TargetFramework>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<UseWPF>true</UseWPF>
8+
<RootNamespace>DotNetSimaticDatabaseProtokollerConfigurationTool</RootNamespace>
9+
<ApplicationManifest>app.manifest</ApplicationManifest>
10+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
11+
</PropertyGroup>
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1313
<PlatformTarget>AnyCPU</PlatformTarget>
14-
</PropertyGroup>
15-
<ItemGroup>
16-
<None Remove="Images\*" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.115" />
20-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
21-
</ItemGroup>
22-
<ItemGroup>
23-
<ProjectReference Include="..\..\LibNoDaveConnectionLibrary.WinForms\DotNetSiemensPLCToolBoxLibrary.WinForms.csproj" />
24-
<ProjectReference Include="..\..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
25-
<ProjectReference Include="..\ProtokollerLibrary\JFK-ProtokollerLibrary.csproj" />
26-
</ItemGroup>
27-
<ItemGroup>
28-
<Resource Include="Images\*" />
29-
</ItemGroup>
30-
<ItemGroup>
31-
<Reference Include="JFKCommonLibrary">
32-
<HintPath>..\..\externalDlls\JFKCommonLibrary.dll</HintPath>
33-
</Reference>
34-
<Reference Include="System.ServiceProcess" />
35-
</ItemGroup>
14+
</PropertyGroup>
15+
<ItemGroup>
16+
<None Remove="Images\*" />
17+
</ItemGroup>
18+
<ItemGroup>
19+
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.115" />
20+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<ProjectReference Include="..\..\LibNoDaveConnectionLibrary.WinForms\DotNetSiemensPLCToolBoxLibrary.WinForms.csproj" />
24+
<ProjectReference Include="..\..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
25+
<ProjectReference Include="..\ProtokollerLibrary\JFK-ProtokollerLibrary.csproj" />
26+
</ItemGroup>
27+
<ItemGroup>
28+
<Resource Include="Images\*" />
29+
</ItemGroup>
30+
<ItemGroup>
31+
<Reference Include="JFKCommonLibrary">
32+
<HintPath>..\..\externalDlls\JFKCommonLibrary.dll</HintPath>
33+
</Reference>
34+
<Reference Include="System.ServiceProcess" />
35+
</ItemGroup>
3636
</Project>

‎DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
33
<PropertyGroup>
44
<OutputType>Library</OutputType>

‎DotNetSiemensPLCToolBoxLibrary.TIAV17/DotNetSiemensPLCToolBoxLibrary.TIAV17.csproj‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2-
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFramework>net48</TargetFramework>
6-
<UseWindowsForms>true</UseWindowsForms>
7-
<UseWPF>true</UseWPF>
8-
</PropertyGroup>
9-
<PropertyGroup>
10-
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV17</PackageId>
11-
<Authors>DotNetProjects</Authors>
12-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13-
<PackageProjectUrl>https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary</PackageProjectUrl>
14-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15-
<Version>1.0.0</Version>
16-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
17-
<FileVersion>1.0.0.0</FileVersion>
18-
</PropertyGroup>
19-
<PropertyGroup>
20-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
</PropertyGroup>
25-
<ItemGroup>
26-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
27-
</ItemGroup>
28-
<ItemGroup>
29-
<ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
30-
</ItemGroup>
31-
<ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFramework>net48</TargetFramework>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<UseWPF>true</UseWPF>
8+
</PropertyGroup>
9+
<PropertyGroup>
10+
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV17</PackageId>
11+
<Authors>DotNetProjects</Authors>
12+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13+
<PackageProjectUrl>https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary</PackageProjectUrl>
14+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15+
<Version>1.0.0</Version>
16+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
17+
<FileVersion>1.0.0.0</FileVersion>
18+
</PropertyGroup>
19+
<PropertyGroup>
20+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22+
<IncludeSymbols>true</IncludeSymbols>
23+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24+
</PropertyGroup>
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
30+
</ItemGroup>
31+
<ItemGroup>
3232
<Reference Include="Siemens.Engineering">
3333
<HintPath>..\externalDlls\siemens\V17\Siemens.Engineering.dll</HintPath>
3434
<Private>false</Private>
35-
<SpecificVersion>false</SpecificVersion>
36-
</Reference>
35+
<SpecificVersion>false</SpecificVersion>
36+
</Reference>
3737
<Reference Include="Siemens.Engineering.Hmi">
3838
<HintPath>..\externalDlls\siemens\V17\Siemens.Engineering.Hmi.dll</HintPath>
3939
<Private>false</Private>
40-
<SpecificVersion>false</SpecificVersion>
41-
</Reference>
42-
<Reference Include="System.Windows.Forms" />
43-
</ItemGroup>
40+
<SpecificVersion>false</SpecificVersion>
41+
</Reference>
42+
<Reference Include="System.Windows.Forms" />
43+
</ItemGroup>
4444
</Project>

‎DotNetSiemensPLCToolBoxLibrary.TIAV18/DotNetSiemensPLCToolBoxLibrary.TIAV18.csproj‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2-
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFramework>net48</TargetFramework>
6-
<UseWindowsForms>true</UseWindowsForms>
7-
<UseWPF>true</UseWPF>
8-
</PropertyGroup>
9-
<PropertyGroup>
10-
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV18</PackageId>
11-
<Authors>DotNetProjects</Authors>
12-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13-
<PackageProjectUrl>https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary</PackageProjectUrl>
14-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15-
<Version>1.0.0</Version>
16-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
17-
<FileVersion>1.0.0.0</FileVersion>
18-
</PropertyGroup>
19-
<PropertyGroup>
20-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
</PropertyGroup>
25-
<ItemGroup>
26-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
27-
</ItemGroup>
28-
<ItemGroup>
29-
<ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
30-
</ItemGroup>
31-
<ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFramework>net48</TargetFramework>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<UseWPF>true</UseWPF>
8+
</PropertyGroup>
9+
<PropertyGroup>
10+
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV18</PackageId>
11+
<Authors>DotNetProjects</Authors>
12+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13+
<PackageProjectUrl>https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary</PackageProjectUrl>
14+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15+
<Version>1.0.0</Version>
16+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
17+
<FileVersion>1.0.0.0</FileVersion>
18+
</PropertyGroup>
19+
<PropertyGroup>
20+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22+
<IncludeSymbols>true</IncludeSymbols>
23+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24+
</PropertyGroup>
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
30+
</ItemGroup>
31+
<ItemGroup>
3232
<Reference Include="Siemens.Engineering">
3333
<HintPath>..\externalDlls\siemens\V18\Siemens.Engineering.dll</HintPath>
3434
<Private>false</Private>
35-
<SpecificVersion>false</SpecificVersion>
36-
</Reference>
35+
<SpecificVersion>false</SpecificVersion>
36+
</Reference>
3737
<Reference Include="Siemens.Engineering.Hmi">
3838
<HintPath>..\externalDlls\siemens\V18\Siemens.Engineering.Hmi.dll</HintPath>
3939
<Private>false</Private>
40-
<SpecificVersion>false</SpecificVersion>
41-
</Reference>
42-
<Reference Include="System.Windows.Forms" />
43-
</ItemGroup>
40+
<SpecificVersion>false</SpecificVersion>
41+
</Reference>
42+
<Reference Include="System.Windows.Forms" />
43+
</ItemGroup>
4444
</Project>

‎DotNetSiemensPLCToolBoxLibrary.TIAV21/DotNetSiemensPLCToolBoxLibrary.TIAV21.csproj‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup><GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks></PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFramework>net48</TargetFramework>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<UseWPF>true</UseWPF>
8+
</PropertyGroup>
9+
<PropertyGroup>
10+
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV21</PackageId>
11+
<Authors>DotNetProjects</Authors>
12+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13+
<PackageProjectUrl>https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary</PackageProjectUrl>
14+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15+
<Version>1.0.0</Version>
16+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
17+
<FileVersion>1.0.0.0</FileVersion>
18+
</PropertyGroup>
19+
<PropertyGroup>
20+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22+
<IncludeSymbols>true</IncludeSymbols>
23+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24+
</PropertyGroup>
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<Reference Include="Siemens.Engineering.Base">
33+
<HintPath>..\externalDlls\siemens\V21\net48\Siemens.Engineering.Base.dll</HintPath>
34+
<Private>False</Private>
35+
<SpecificVersion>False</SpecificVersion>
36+
</Reference>
37+
<Reference Include="Siemens.Engineering.Step7">
38+
<HintPath>..\externalDlls\siemens\V21\net48\Siemens.Engineering.Step7.dll</HintPath>
39+
<Private>False</Private>
40+
<SpecificVersion>False</SpecificVersion>
41+
</Reference>
42+
<Reference Include="Siemens.Engineering.WinCC">
43+
<HintPath>..\externalDlls\siemens\V21\net48\Siemens.Engineering.WinCC.dll</HintPath>
44+
<Private>False</Private>
45+
<SpecificVersion>False</SpecificVersion>
46+
</Reference>
47+
<Reference Include="Siemens.Engineering.WinCC.Extension">
48+
<HintPath>..\externalDlls\siemens\V21\net48\Siemens.Engineering.WinCC.Extension.dll</HintPath>
49+
<Private>False</Private>
50+
<SpecificVersion>False</SpecificVersion>
51+
</Reference>
52+
<Reference Include="System.Windows.Forms" />
53+
</ItemGroup>
54+
</Project>

‎DotNetSiemensPLCToolBoxLibrary.TIAV21/SelectPortalInstance.xaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Window x:Class="DotNetSiemensPLCToolBoxLibrary.TIAV21.SelectPortalInstance"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
mc:Ignorable="d" WindowStyle="ToolWindow" WindowStartupLocation="CenterScreen"
7+
Height="450" Width="800">
8+
<Grid>
9+
<ListBox x:Name="lstInstances" Margin="10,31,10,64"/>
10+
<TextBlock HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Select Portal Instance" VerticalAlignment="Top"/>
11+
<Button Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="130" Height="49" Click="Button_Click"/>
12+
</Grid>
13+
</Window>

‎DotNetSiemensPLCToolBoxLibrary.TIAV21/SelectPortalInstance.xaml.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace DotNetSiemensPLCToolBoxLibrary.TIAV21
2+
{
3+
public partial class SelectPortalInstance
4+
{
5+
public SelectPortalInstance()
6+
{
7+
InitializeComponent();
8+
}
9+
10+
private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
11+
{
12+
this.Close();
13+
}
14+
}
15+
}

0 commit comments

Comments
 (0)