From 1fb64730717d5d83b9fd1c3e7442e3ee5d87cd27 Mon Sep 17 00:00:00 2001
From: Patrick Schuler <patrick.schuler@microsoft.com>
Date: Thu, 14 Oct 2021 09:32:19 +0200
Subject: [PATCH] Fixing docker build for LNS (#527)

* docker module builds were broken for the network server due to the addition of buidl props and version synchronization. The versions were not picked up causing the build to break.

* removing stylecop

Co-authored-by: Patrick Schuler <paschule@microsoft.com>
---
 .../LoRaWanNetworkSrvModule/Dockerfile.amd64  |  2 +-
 .../Dockerfile.amd64.debug                    |  2 +-
 .../Dockerfile.arm32v7                        |  2 +-
 .../Cli-LoRa-Device-Provisioning.csproj       |  9 ----
 stylecop.ruleset                              | 47 -------------------
 5 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 stylecop.ruleset

diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64 b/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64
index 8172a2be2..7dc68b9ee 100644
--- a/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64
+++ b/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
 
 WORKDIR /build
-COPY ./stylecop.* ./
+COPY ./LoRaEngine/Directory.Build.props ./
 
 WORKDIR /build/LoRaEngine/modules/LoRaWanNetworkSrvModule/
 COPY ./LoRaEngine/modules/LoRaWanNetworkSrvModule/Logger ./Logger
diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64.debug b/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64.debug
index 3d7f28da2..aaaffc7b0 100644
--- a/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64.debug
+++ b/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.amd64.debug
@@ -12,7 +12,7 @@ RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
 
 WORKDIR /build
-COPY ./stylecop.* ./
+COPY ./LoRaEngine/Directory.Build.props ./
 
 WORKDIR /build/LoRaEngine/modules/LoRaWanNetworkSrvModule/
 COPY ./LoRaEngine/modules/LoRaWanNetworkSrvModule/Logger ./Logger
diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.arm32v7 b/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.arm32v7
index 4f7a3a943..1049cc2d7 100644
--- a/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.arm32v7
+++ b/LoRaEngine/modules/LoRaWanNetworkSrvModule/Dockerfile.arm32v7
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
 
 WORKDIR /build
-COPY ./stylecop.* ./
+COPY ./LoRaEngine/Directory.Build.props ./
 
 WORKDIR /build/LoRaEngine/modules/LoRaWanNetworkSrvModule/
 COPY ./LoRaEngine/modules/LoRaWanNetworkSrvModule/Logger ./Logger
diff --git a/Tools/Cli-LoRa-Device-Provisioning/Cli-LoRa-Device-Provisioning.csproj b/Tools/Cli-LoRa-Device-Provisioning/Cli-LoRa-Device-Provisioning.csproj
index e276ee576..29a06f6d0 100644
--- a/Tools/Cli-LoRa-Device-Provisioning/Cli-LoRa-Device-Provisioning.csproj
+++ b/Tools/Cli-LoRa-Device-Provisioning/Cli-LoRa-Device-Provisioning.csproj
@@ -33,13 +33,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
-  <!-- StyleCop Setup -->
-  <ItemGroup>
-    <AdditionalFiles Include="../../stylecop.json" Link="stylecop.json" />
-  </ItemGroup>
-  <PropertyGroup>
-    <CodeAnalysisRuleSet>../../stylecop.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <Import Project="../../stylecop.props" />
-
 </Project>
diff --git a/stylecop.ruleset b/stylecop.ruleset
deleted file mode 100644
index 5b0e51336..000000000
--- a/stylecop.ruleset
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Azure IoT Edge LoRaWAN Ruleset" Description="These StyleCop rules are customized for Azure IoT Edge LoRaWAN projects." ToolsVersion="15.0">
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <!-- XML comment generation must be enabled -->
-    <Rule Id="SA0001" Action="None" />
-
-    <!-- Constructor should not follow a property -->
-    <Rule Id="SA1201" Action="None" />
-
-    <!-- public members before private -->
-    <Rule Id="SA1202" Action="None" />
-
-    <!-- statics must be before public members -->
-    <Rule Id="SA1204" Action="None" />
-
-    <!-- Fields should not contain underscore: it is ok for constants -->
-    <Rule Id="SA1310" Action="None" />
-
-    <!-- Should declare access modifier -->
-    <Rule Id="SA1400" Action="None" />
-
-    <!-- Arithmetic expressions should declare precedence, using parenthesis -->
-    <Rule Id="SA1407" Action="None" />
-
-    <!-- Use trailing comma in multi-line  -->
-    <Rule Id="SA1413" Action="None" />
-
-    <!-- bracers should not be omitted -->
-    <Rule Id="SA1503" Action="None" />
-
-    <!-- Single-line comments should be preceded by blank line -->
-    <Rule Id="SA1515" Action="None" />
-
-    <!-- elements should be documented -->
-    <Rule Id="SA1600" Action="None" />
-
-    <!-- enumeration items should be documented -->
-    <Rule Id="SA1602" Action="None" />
-
-    <!-- Documentation for parameters -->
-    <Rule Id="SA1611" Action="None" />
-
-    <!-- Element return value should be documented -->
-    <Rule Id="SA1615" Action="None" />
-
-  </Rules>
-</RuleSet>