Skip to content

Commit 9c6811b

Browse files
committed
Revert "Update target SDK to 2.1 and explicitly specify base image arch and OS (#38)"
This reverts commit 2685e4c.
1 parent 2685e4c commit 9c6811b

14 files changed

+21
-21
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: csharp
2-
dotnet: 2.1.301
2+
dotnet: 2.0.2
33
mono: alpha
44
before_install:
55
- mkdir -p .nuget

Microsoft.Azure.IoT.Edge.Module.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>Microsoft.Azure.IoT.Edge.Module</id>
5-
<version>2.0.0-rc6</version>
5+
<version>2.0.0-rc5</version>
66
<title>Azure IoT Edge Module</title>
77
<authors>Microsoft</authors>
88
<owners>microsoft, nugetazureiotedge</owners>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The template will set up all necessary files for you to focus on functionality p
66

77
## Get Started
88

9-
Make sure you have [.Net Core 2.1 SDK](https://www.microsoft.com/net/download/core) installed.
9+
Make sure you have [.Net Core 2.0 SDK](https://www.microsoft.com/net/download/core) installed.
1010

1111
Run `dotnet` command to install the template:
1212

Test/Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.1-sdk-stretch AS build-env
1+
FROM microsoft/dotnet:2.0-sdk AS build-env
22
WORKDIR /app
33

44
COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
77
COPY . ./
88
RUN dotnet publish -c Release -o out
99

10-
FROM microsoft/dotnet:2.1-runtime-stretch-slim
10+
FROM microsoft/dotnet:2.0-runtime
1111
WORKDIR /app
1212
COPY --from=build-env /app/out ./
1313

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.1-runtime-stretch-slim AS base
1+
FROM microsoft/dotnet:2.0-runtime-stretch AS base
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
88
USER moduleuser
99
RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
1010

11-
FROM microsoft/dotnet:2.1-sdk-stretch AS build-env
11+
FROM microsoft/dotnet:2.0-sdk AS build-env
1212
WORKDIR /app
1313

1414
COPY *.csproj ./

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.1-sdk-stretch-arm32v7 AS build-env
1+
FROM microsoft/dotnet:2.1-sdk AS build-env
22
WORKDIR /app
33

44
COPY *.csproj ./
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.1-sdk-nanoserver-1803 AS build-env
1+
FROM microsoft/dotnet:2.0-sdk AS build-env
22
WORKDIR /app
33

44
COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
77
COPY . ./
88
RUN dotnet publish -c Release -o out
99

10-
FROM microsoft/dotnet:2.1-runtime-nanoserver-1803
10+
FROM microsoft/dotnet:2.0-runtime
1111
WORKDIR /app
1212
COPY --from=build-env /app/out ./
1313
ENTRYPOINT ["dotnet", "SampleModule.dll"]

content/dotnet-template-azure-iot-edge-module/CSharp/SampleModule.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
66

7-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.1|AnyCPU'">
7+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
88
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
99
<TreatSpecificWarningsAsErrors />
1010
</PropertyGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.1-sdk-stretch AS build-env
1+
FROM microsoft/dotnet:2.0-sdk AS build-env
22
WORKDIR /app
33

44
COPY *.fsproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
77
COPY . ./
88
RUN dotnet publish -c Release -o out
99

10-
FROM microsoft/dotnet:2.1-runtime-stretch-slim
10+
FROM microsoft/dotnet:2.0-runtime
1111
WORKDIR /app
1212
COPY --from=build-env /app/out ./
1313

0 commit comments

Comments
 (0)