Merge branch 'dependabot/github_actions/actions/download-artifact-4' …

…into dependabot/github_actions/actions/upload-artifact-4
siemens · Dec 18, 2023 · 6791095 · 6791095
2 parents 8d45efb + c8bc640
commit 6791095
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 103 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,31 +14,31 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup .NET Core 2.1
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "2.1.x"
       - name: Setup .NET Core 3.1
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "3.1.x"
       - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "6.0.x"
       - name: Setup .NET 7.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "7.0.x"
       - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "8.0.x"
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
       - name: Run tests
         run: dotnet test --collect:"XPlat Code Coverage" 
       - name: Upload coverage
@@ -52,15 +52,15 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-      - uses: actions/download-artifact@v2
+        uses: actions/setup-dotnet@v4
+      - uses: actions/download-artifact@v4
         with:
           name: Code coverage windows-latest
           path: coverage-windows
       - name: Generate coverage report
-        uses: danielpalme/ReportGenerator-GitHub-Action@4.8.12
+        uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
         with:
           reports: "**/coverage.cobertura.xml"
           targetdir: "coverage-report"
@@ -77,11 +77,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
       - name: Create packages
         run: dotnet pack --configuration Release --output ./packages
       - name: Upload a Build Artifact
@@ -96,12 +96,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-      - uses: actions/download-artifact@v2
+        uses: actions/setup-dotnet@v4
+      - uses: actions/download-artifact@v4
         with:
           name: NuGet packages
           path: packages

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-      <Version>3.4.244</Version>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
+      <Version>3.6.133</Version>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/src/Webserver.API/Webserver.API.csproj b/src/Webserver.API/Webserver.API.csproj
@@ -1,41 +1,41 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net48;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <AssemblyName>Siemens.Simatic.S7.Webserver.API</AssemblyName>
-    <RootNamespace>Siemens.Simatic.S7.Webserver.API</RootNamespace>
-    <Platforms>x64;AnyCPU;x86</Platforms>
-    <Description>Webserver API client library for PLC1500; PLC1200.</Description>
-    <PackageTags>SIEMENS;SIMATIC;PLC;S7;CPU;SPS;PLC1500;PLC1200;PLC-1500;PLC-1200;S71500;S71200;S7-1500;S7-1200;CPU-1500;CPU-1200;CPU1500;CPU1200;SPS1500;SPS1200;SPS-1500;SPS-1200;PLCSIM;PLCSIMAdvanced;SoftwareController;DriveController;SimaticDriveController;Webserver;WebApi;WebserverApi;REST;Automation;EmbeddedSystem;FactoryAutomation</PackageTags>
-    <PackageReleaseNotes>first release</PackageReleaseNotes>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/siemens/simatic-s7-webserver-api</PackageProjectUrl>
-    <Authors>SIEMENS</Authors>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <PackageIcon>product-simatic-s7-1500-256-256.png</PackageIcon>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="MimeMapping" Version="1.0.1.37" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
-  </ItemGroup>
-
-	<ItemGroup>
-    <None Include="..\..\docs\screens\product-simatic-s7-1500-256-256.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-  </ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net48;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <AssemblyName>Siemens.Simatic.S7.Webserver.API</AssemblyName>
+    <RootNamespace>Siemens.Simatic.S7.Webserver.API</RootNamespace>
+    <Platforms>x64;AnyCPU;x86</Platforms>
+    <Description>Webserver API client library for PLC1500; PLC1200.</Description>
+    <PackageTags>SIEMENS;SIMATIC;PLC;S7;CPU;SPS;PLC1500;PLC1200;PLC-1500;PLC-1200;S71500;S71200;S7-1500;S7-1200;CPU-1500;CPU-1200;CPU1500;CPU1200;SPS1500;SPS1200;SPS-1500;SPS-1200;PLCSIM;PLCSIMAdvanced;SoftwareController;DriveController;SimaticDriveController;Webserver;WebApi;WebserverApi;REST;Automation;EmbeddedSystem;FactoryAutomation</PackageTags>
+    <PackageReleaseNotes>first release</PackageReleaseNotes>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/siemens/simatic-s7-webserver-api</PackageProjectUrl>
+    <Authors>SIEMENS</Authors>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <PackageIcon>product-simatic-s7-1500-256-256.png</PackageIcon>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="MimeMapping" Version="1.0.1.37" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
+  </ItemGroup>
+
+	<ItemGroup>
+    <None Include="..\..\docs\screens\product-simatic-s7-1500-256-256.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj b/tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj
@@ -1,40 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup Label="Globals">
-		<Platforms>x64;AnyCPU;x86</Platforms>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
-		<IsPackable>false</IsPackable>
-		<AssemblyName>Webserver.API.UnitTests</AssemblyName>
-		<RootNamespace>Webserver.API.UnitTests</RootNamespace>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="MimeMapping" Version="1.0.1.37" />
-		<PackageReference Include="nunit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\src\Webserver.API\Webserver.API.csproj" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-	</ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup Label="Globals">
+		<Platforms>x64;AnyCPU;x86</Platforms>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
+		<IsPackable>false</IsPackable>
+		<AssemblyName>Webserver.API.UnitTests</AssemblyName>
+		<RootNamespace>Webserver.API.UnitTests</RootNamespace>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="MimeMapping" Version="1.0.1.37" />
+		<PackageReference Include="nunit" Version="3.13.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\Webserver.API\Webserver.API.csproj" />
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+	</ItemGroup>
+
 </Project>