Merge arm64-preview feature to master (#74)

Co-authored-by: Jun Han <[email protected]>

Author: blackchoey

.travis.yml

@@ -1,5 +1,5 @@
 language: csharp
-dotnet: 2.1
+dotnet: 3.0
 mono: alpha
 before_install:
   - mkdir -p .nuget

Microsoft.Azure.IoT.Edge.Module.nuspec

@@ -2,7 +2,7 @@
 <package>
     <metadata>
     <id>Microsoft.Azure.IoT.Edge.Module</id>
-    <version>2.7.0</version>
+    <version>3.1.0-RC</version>
     <title>Azure IoT Edge Module</title>
     <authors>Microsoft</authors>
     <owners>microsoft, nugetazureiotedge</owners>

README.md

@@ -9,7 +9,7 @@ The template will set up all necessary files for you to focus on functionality p
 
 ## Get Started
 
-Make sure you have [.Net Core 2.0 SDK](https://www.microsoft.com/net/download/core) installed.
+Make sure you have [.Net Core 3.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0) installed.
 
 Run `dotnet` command to install the template:
 

Test/Test.cs

@@ -55,7 +55,7 @@ public void TestArchitecture(string lang, bool skipRestore)
         {
             var repository = "test.azurecr.io/test";
             var scaffoldName = BeforeEach(lang, repository, skipRestore);
-            var filesToCheck = new List<string> { ".gitignore", "module.json", "Dockerfile.amd64", "Dockerfile.amd64.debug", "Dockerfile.arm32v7", "Dockerfile.arm32v7.debug", "Dockerfile.windows-amd64", ".dockerignore" };
+            var filesToCheck = new List<string> { ".gitignore", "module.json", "Dockerfile.amd64", "Dockerfile.amd64.debug", "Dockerfile.arm32v7", "Dockerfile.arm32v7.debug", "Dockerfile.windows-amd64", "Dockerfile.arm64v8", ".dockerignore" };
 
             if (skipRestore)
             {
@@ -68,7 +68,7 @@ public void TestArchitecture(string lang, bool skipRestore)
 
             if (lang == CSharp)
             {
-                filesToCheck.AddRange(new List<string> { "Program.cs", scaffoldName + ".csproj" });
+                filesToCheck.AddRange(new List<string> { "Program.cs", scaffoldName + ".csproj", "Dockerfile.arm64v8.debug" });
             }
             if (lang == FSharp)
             {

Test/Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.amd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim
+FROM mcr.microsoft.com/dotnet/core/runtime:3.0-buster-slim
 WORKDIR /app
 COPY --from=build-env /app/out ./
 

content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.amd64.debug

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim AS base
+FROM mcr.microsoft.com/dotnet/core/runtime:3.0-buster-slim AS base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build-env
 WORKDIR /app
 
 COPY *.csproj ./

content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm32v7

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster-arm32v7 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/core/runtime:3.0-buster-slim-arm32v7
 WORKDIR /app
 COPY --from=build-env /app/out ./
 

content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm32v7.debug

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim-arm32v7 AS base
+FROM mcr.microsoft.com/dotnet/core/runtime:3.0-buster-slim-arm32v7 AS base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster-arm32v7 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./

content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm64v8

@@ -0,0 +1,17 @@
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster-arm64v8 AS build-env
+WORKDIR /app
+
+COPY *.csproj ./
+RUN dotnet restore
+
+COPY . ./
+RUN dotnet publish -c Release -o out
+
+FROM mcr.microsoft.com/dotnet/core/runtime:3.0-buster-slim-arm64v8
+WORKDIR /app
+COPY --from=build-env /app/out ./
+
+RUN useradd -ms /bin/bash moduleuser
+USER moduleuser
+
+ENTRYPOINT ["dotnet", "SampleModule.dll"]