squash dev commits

Azure · Mar 29, 2022 · 01d58db · 01d58db
1 parent be2dfa0
commit 01d58db
Show file tree

Hide file tree

Showing 130 changed files with 534 additions and 2,907 deletions.
diff --git a/Microsoft.Azure.Devices.Edge.sln b/Microsoft.Azure.Devices.Edge.sln
@@ -193,14 +193,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Edg
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Routing.Core.Test", "edge-hub\core\test\Microsoft.Azure.Devices.Routing.Core.Test\Microsoft.Azure.Devices.Routing.Core.Test.csproj", "{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "edge-modules", "edge-modules", "{43E10CBA-2F64-4B4C-A5A5-B9E332DC98A1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "functions", "functions", "{059BC610-4D1E-4A4D-9099-E67DF47D7DB7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4F3B7488-3547-4EEB-A79E-9737182960AB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeHubTriggerCSharp", "edge-modules\functions\samples\EdgeHubTrigger-Csharp\EdgeHubTriggerCSharp.csproj", "{9F5BD0E2-E73D-434A-8568-0C117A0716C9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumberLogger", "test\modules\NumberLogger\NumberLogger.csproj", "{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jsoncanonicalizer", "edge-util\src\jsoncanonicalizer\jsoncanonicalizer.csproj", "{1915CE7E-E949-4633-9862-D92BD5E873B5}"
@@ -211,6 +203,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManifestSignerClient", "sam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IotedgeDiagnosticsDotnet", "edge-modules\iotedge-diagnostics-dotnet\IotedgeDiagnosticsDotnet.csproj", "{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "edge-modules", "edge-modules", "{17D4D30E-7C88-479D-AF04-735DCCBA3AD4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "functions", "functions", "{72DC75C8-2116-4836-BB95-2D2B5BF34452}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{10886974-CE80-40FC-9647-A9C145DE420C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdgeHubTriggerCSharp", "edge-modules\functions\samples\EdgeHubTrigger-Csharp\EdgeHubTriggerCSharp.csproj", "{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CheckInBuild|Any CPU = CheckInBuild|Any CPU
@@ -602,12 +602,6 @@ Global
 		{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -638,6 +632,12 @@ Global
 		{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -720,14 +720,14 @@ Global
 		{111DFD7C-FC04-4A68-8CC1-D986CCC3DAC3} = {F5A09810-99FB-43EB-A86E-A15E48EED108}
 		{240DF1F3-6472-472A-9748-494D79AEF085} = {F5A09810-99FB-43EB-A86E-A15E48EED108}
 		{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189} = {F5A09810-99FB-43EB-A86E-A15E48EED108}
-		{059BC610-4D1E-4A4D-9099-E67DF47D7DB7} = {43E10CBA-2F64-4B4C-A5A5-B9E332DC98A1}
-		{4F3B7488-3547-4EEB-A79E-9737182960AB} = {059BC610-4D1E-4A4D-9099-E67DF47D7DB7}
-		{9F5BD0E2-E73D-434A-8568-0C117A0716C9} = {4F3B7488-3547-4EEB-A79E-9737182960AB}
 		{B0151FFD-85C4-42B9-81CC-9193BADFE9F8} = {F921339B-32F9-4BF3-B364-2DB01FA2F1A1}
 		{1915CE7E-E949-4633-9862-D92BD5E873B5} = {66964A75-04AC-4FDE-8505-E6CB2EF90BE8}
 		{BE39EC1F-7E7C-4421-93BF-1DF02C1E6A15} = {66964A75-04AC-4FDE-8505-E6CB2EF90BE8}
 		{C4C3CEB4-1177-4D1C-9BAE-EE0453831905} = {A6D8677F-DB76-459E-B6DE-110AFCEF7F08}
 		{59CF2F3B-5FCC-43BE-B221-1E7A956D4792} = {578D5330-2F72-44C6-9DB5-C93B3F42C473}
+		{72DC75C8-2116-4836-BB95-2D2B5BF34452} = {17D4D30E-7C88-479D-AF04-735DCCBA3AD4}
+		{10886974-CE80-40FC-9647-A9C145DE420C} = {72DC75C8-2116-4836-BB95-2D2B5BF34452}
+		{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59} = {10886974-CE80-40FC-9647-A9C145DE420C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D71830F5-3AF5-46B4-8A9E-1DCE4F2253AC}

diff --git a/builds/checkin/compatibility-tool-checkin.yaml b/builds/checkin/compatibility-tool-checkin.yaml
@@ -5,9 +5,9 @@ pr:
       - main
 
 jobs:
-  ##############################################################################
+  ################################################################################
   - job: check_run_pipeline
-  ##############################################################################
+  ################################################################################
     displayName: Check pipeline preconditions (changes ARE in platform compatibility script tool)
     pool:
       vmImage: "ubuntu-20.04"
@@ -16,30 +16,11 @@ jobs:
         submodules: false
         fetchDepth: 3
       - bash: |
-          git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(platform-validation/scripts|builds/checkin/compatibility-tool-checkin)'
+          git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(platform-validation/scripts/aziot-compatibility)'
           if [[ $? == 0 ]]; then
-            echo "Detected changes in platform compatibility script folder"
-            echo "##vso[task.setvariable variable=RUN_PIPELINE;isOutput=true]TRUE"
+            echo "Detected changes in platform compatibility script tool"
+            sudo apt update
+            sudo apt install shellcheck
+            shellcheck --severity=error ./platform-validation/scripts/aziot-compatibility.sh
           fi
-        displayName: Check changes in platform compatibility script
-        name: check_files
-
-##############################################################################
-  - job: run_checks
-##############################################################################
-    displayName: Run Checks
-    dependsOn: check_run_pipeline
-    condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
-    pool:
-      vmImage: "ubuntu-20.04"
-    steps:
-      - checkout: self
-        submodules: false
-        fetchDepth: 3
-      - bash: |
-          sudo apt update
-          sudo apt install shellcheck
-          shellcheck --severity=error ./platform-validation/scripts/aziot-compatibility.sh
-        displayName: Perform Shell Check
-      - bash: platform-validation/scripts/aziot-compatibility.sh -a aziotedge
-        displayName: Run Compatibility Tool
+        displayName: Check changes in platform compatibility script tool and perform shellcheck
diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml
@@ -11,7 +11,7 @@ jobs:
 ################################################################################
     displayName: Check pipeline preconditions (changes ARE NOT in either edgelet, docs, or mqtt folder)
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
       - bash: |
           git log -m -1 --name-only --first-parent --pretty="" | egrep -i -v '^(edgelet|doc|mqtt)'
@@ -29,7 +29,7 @@ jobs:
     dependsOn: check_run_pipeline
     condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
       - task: Bash@3
         displayName: Install Prerequisites
@@ -66,7 +66,7 @@ jobs:
     variables:
       coverage.goal: 60
     pool:
-      vmImage: windows-2019
+      vmImage: windows-2022
     steps:
       - task: DotNetCoreCLI@2
         displayName: Build

diff --git a/builds/checkin/edgelet.yaml b/builds/checkin/edgelet.yaml
@@ -62,8 +62,8 @@ jobs:
         displayName: Set Version
       - bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
         displayName: Install Rust
-      - script: "cargo install cross --version ^0.2"
-        displayName: "Install cross"
+      - script: "cargo install --git https://github.com/arsing/cross.git --branch set-path"
+        displayName: "Install cross (fork with docker fix)"
       - script: "cross build --target armv7-unknown-linux-gnueabihf"
         displayName: armv7-unknown-linux-gnueabihf build
         workingDirectory: $(Build.SourcesDirectory)/edgelet
@@ -91,8 +91,8 @@ jobs:
         displayName: Set Version
       - bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
         displayName: Install Rust
-      - script: "cargo install cross --version ^0.2"
-        displayName: "Install cross"
+      - script: "cargo install --git https://github.com/arsing/cross.git --branch set-path"
+        displayName: "Install cross (fork with docker fix)"
       - script: "cross build --target aarch64-unknown-linux-gnu"
         displayName: aarch64-unknown-linux-gnu build
         workingDirectory: $(Build.SourcesDirectory)/edgelet

diff --git a/builds/ci/edgelet.yaml b/builds/ci/edgelet.yaml
@@ -54,8 +54,8 @@ jobs:
         inputs:
           filePath: scripts/linux/generic-rust/install.sh
           arguments: --project-root "edgelet"
-      - script: cargo install cross --version ^0.2
-        displayName: Install cross
+      - script: cargo install --git https://github.com/arsing/cross.git --branch set-path
+        displayName: Install cross (fork with docker fix)
       - task: Bash@3
         displayName: armv7-unknown-linux-gnueabihf build
         inputs:

diff --git a/builds/e2e/compare-compatibility.yaml b/builds/e2e/compare-compatibility.yaml