This commit is contained in:
Spyros Garyfallos 2018-11-14 15:01:57 -08:00
Родитель e871e21da5
Коммит 86204cd03e
26 изменённых файлов: 38 добавлений и 34 удалений

Просмотреть файл

@ -6,7 +6,6 @@ FROM microsoft/dotnet:2.1.302-sdk AS build
WORKDIR /src
COPY Modules/AnomalyDetection/AnomalyDetection.csproj Modules/AnomalyDetection/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/AnomalyDetection/AnomalyDetection.csproj
COPY . .
WORKDIR /src/Modules/AnomalyDetection

Просмотреть файл

@ -6,7 +6,6 @@ FROM microsoft/dotnet:2.1.302-sdk AS build
WORKDIR /src
COPY Modules/ModelTraining/ModelTraining.csproj Modules/ModelTraining/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/ModelTraining/ModelTraining.csproj
COPY . .
WORKDIR /src/Modules/ModelTraining

Просмотреть файл

@ -6,7 +6,6 @@ FROM microsoft/dotnet:2.1.302-sdk AS build
WORKDIR /src
COPY Modules/Orchestrator/Orchestrator.csproj Modules/Orchestrator/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/Orchestrator/Orchestrator.csproj
COPY . .
WORKDIR /src/Modules/Orchestrator

Просмотреть файл

@ -6,7 +6,6 @@ FROM microsoft/dotnet:2.1.302-sdk AS build
WORKDIR /src
COPY Modules/TemperatureSensor/TemperatureSensor.csproj Modules/TemperatureSensor/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/TemperatureSensor/TemperatureSensor.csproj
COPY . .
WORKDIR /src/Modules/TemperatureSensor

Просмотреть файл

@ -10,7 +10,6 @@ COPY Modules/Visualization/Visualization.csproj Modules/Visualization/
COPY Modules/VisualizationWeb/VisualizationWeb.csproj Modules/VisualizationWeb/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/Visualization/Visualization.csproj
COPY . .
WORKDIR /src/Modules/Visualization

Просмотреть файл

@ -6,7 +6,6 @@ FROM microsoft/dotnet:2.1.302-sdk AS build
WORKDIR /src
COPY Modules/TemperatureSensor/TemperatureSensor.csproj Modules/TemperatureSensor/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/TemperatureSensor/TemperatureSensor.csproj
COPY . .
WORKDIR /src/Modules/TemperatureSensor

Просмотреть файл

@ -36,12 +36,7 @@ FROM microsoft/dotnet:2.1.302-sdk AS build
WORKDIR /src
COPY Thermostat.Emulator/Thermostat.Emulator.csproj Thermostat.Emulator/
COPY Thermostat.Shared/Thermostat.Shared.csproj Thermostat.Shared/
COPY Modules/Orchestrator/Orchestrator.csproj Modules/Orchestrator/
COPY Modules/TemperatureSensor/TemperatureSensor.csproj Modules/TemperatureSensor/
COPY Modules/ModelTraining/ModelTraining.csproj Modules/ModelTraining/
COPY Modules/AnomalyDetection/AnomalyDetection.csproj Modules/AnomalyDetection/
COPY Modules/Visualization/Visualization.csproj Modules/Visualization/
COPY Modules/VisualizationWeb/VisualizationWeb.csproj Modules/VisualizationWeb/
COPY ./.env Thermostat.Emulator/
COPY NuGet.Config ./

Просмотреть файл

@ -3,6 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<NoWarn>NU1603</NoWarn>
<LangVersion>latest</LangVersion>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>

Просмотреть файл

@ -32,26 +32,26 @@ Global
{1A622C23-B9BD-4903-A28D-28B446BB358E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A622C23-B9BD-4903-A28D-28B446BB358E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A622C23-B9BD-4903-A28D-28B446BB358E}.Release|Any CPU.Build.0 = Release|Any CPU
{1A622C23-B9BD-4903-A28D-28B446BB358E}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
{1A622C23-B9BD-4903-A28D-28B446BB358E}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
{1A622C23-B9BD-4903-A28D-28B446BB358E}.TemplateDevelopment|Any CPU.ActiveCfg = Release|Any CPU
{1A622C23-B9BD-4903-A28D-28B446BB358E}.TemplateDevelopment|Any CPU.Build.0 = Release|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.Release|Any CPU.Build.0 = Release|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.TemplateDevelopment|Any CPU.ActiveCfg = Release|Any CPU
{7DB0AED8-EA6D-466E-B173-6C6BA4A692CF}.TemplateDevelopment|Any CPU.Build.0 = Release|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.Release|Any CPU.Build.0 = Release|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.TemplateDevelopment|Any CPU.ActiveCfg = Release|Any CPU
{258D1CCE-A112-46A2-88F1-D9BA50450C7B}.TemplateDevelopment|Any CPU.Build.0 = Release|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.Release|Any CPU.Build.0 = Release|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.TemplateDevelopment|Any CPU.ActiveCfg = Release|Any CPU
{D6E0653E-E1CB-46CD-8D2B-0D6D430A5DFA}.TemplateDevelopment|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -1 +1,10 @@
version: '3.4'
services:
emulatorimage:
image: ${DOCKER_REGISTRY}emulatorimage
build:
context: .
dockerfile: TypeEdgeApplication.Emulator/Dockerfile
volumes:
- env:/app/env

Просмотреть файл

@ -0,0 +1,2 @@
version: '3.4'

Просмотреть файл

@ -0,0 +1,2 @@
version: '3.4'

Просмотреть файл

@ -10,7 +10,7 @@
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<licenseUrl>https://github.com/Azure/TypeEdge/blob/master/LICENSE</licenseUrl>
<description>TypeEdge introduces a strongly-typed flavor of the inherently loosely coupled vanilla Azure IoT Edge.</description>
<tags>Microsoft;Azure;IoT;Edge</tags>
<tags>Microsoft;Azure;IoT;Edge;Experimental</tags>
<iconUrl>https://github.com/Azure/TypeEdge/blob/master/Templates/favicon.ico</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>

Просмотреть файл

@ -8,7 +8,7 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
<Configurations>Debug;Release</Configurations>
<Version>0.4.4.36</Version>
<Version>0.4.4.37</Version>
<NuspecProperties>version=$(Version)</NuspecProperties>
<NuspecFile>.nuspec</NuspecFile>

Просмотреть файл

@ -244,6 +244,8 @@ namespace Microsoft.Azure.TypeEdge.Host
private void BuildHub(string deviceSasKey)
{
var currentLocation = Path.GetDirectoryName(Assembly.GetCallingAssembly().Location);
if (_inContainer)
currentLocation = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
Environment.SetEnvironmentVariable(HubService.Constants.EdgeHubServerCertificateFileKey,
Path.Combine(currentLocation, @"Certificates/edge-hub-server/cert/edge-hub-server.cert.pfx"));
@ -291,6 +293,8 @@ namespace Microsoft.Azure.TypeEdge.Host
{
var certificatePath = @"Certificates/edge-device-ca/cert/edge-device-ca-root.cert.pem";
var currentLocation = Path.GetDirectoryName(Assembly.GetCallingAssembly().Location);
if(_inContainer)
currentLocation = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
foreach (var module in _modules)

Просмотреть файл

@ -6,13 +6,13 @@
<PackageId>Microsoft.Azure.TypeEdge.Proxy</PackageId>
<Authors>Microsoft</Authors>
<Version>0.4.4.35</Version>
<Version>0.4.4.36</Version>
<PackageProjectUrl>https://aka.ms/TypeEdge</PackageProjectUrl>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageLicenseUrl>https://github.com/Azure/TypeEdge/blob/master/LICENSE</PackageLicenseUrl>
<Description>TypeEdge introduces a strongly-typed flavor of the inherently loosely coupled vanilla Azure IoT Edge.</Description>
<PackageTags>Microsoft;Azure;IoT;Edge</PackageTags>
<PackageTags>Microsoft;Azure;IoT;Edge;Experimental</PackageTags>
<PackageIconUrl>https://github.com/Azure/TypeEdge/blob/master/Templates/favicon.ico</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

Просмотреть файл

@ -6,13 +6,13 @@
<PackageId>Microsoft.Azure.TypeEdge</PackageId>
<Authors>Microsoft</Authors>
<Version>0.4.4.35</Version>
<Version>0.4.4.36</Version>
<PackageProjectUrl>https://aka.ms/TypeEdge</PackageProjectUrl>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageLicenseUrl>https://github.com/Azure/TypeEdge/blob/master/LICENSE</PackageLicenseUrl>
<Description>TypeEdge introduces a strongly-typed flavor of the inherently loosely coupled vanilla Azure IoT Edge.</Description>
<PackageTags>Microsoft;Azure;IoT;Edge</PackageTags>
<PackageTags>Microsoft;Azure;IoT;Edge;Experimental</PackageTags>
<PackageIconUrl>https://github.com/Azure/TypeEdge/blob/master/Templates/favicon.ico</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

Просмотреть файл

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
<PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.36" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
<PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.36" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<LangVersion>latest</LangVersion>
<NoWarn>NU1603</NoWarn>
</PropertyGroup>
<ItemGroup>
@ -15,7 +16,7 @@
<ItemGroup>
<PackageReference Include="rocksdb-native-arm" Version="5.4.6" />
<PackageReference Include="RocksDbNative" Version="5.4.6.10" />
<PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.*" />
<PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.37" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.*" />
<PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.36" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
<PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.36" />
</ItemGroup>
</Project>

Просмотреть файл

@ -5,7 +5,6 @@ FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /src
COPY Modules/TypeEdgeModule1/TypeEdgeModule1.csproj Modules/TypeEdgeModule1/
COPY TypeEdgeML.Shared/TypeEdgeML.Shared.csproj TypeEdgeML.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
COPY . .
WORKDIR /src/Modules/TypeEdgeModule1

Просмотреть файл

@ -5,7 +5,6 @@ FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /src
COPY Modules/TypeEdgeModule2/TypeEdgeModule2.csproj Modules/TypeEdgeModule2/
COPY TypeEdgeML.Shared/TypeEdgeML.Shared.csproj TypeEdgeML.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
COPY . .
WORKDIR /src/Modules/TypeEdgeModule2

Просмотреть файл

@ -9,7 +9,6 @@ FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /src
COPY Modules/TypeEdgeModule3/TypeEdgeModule3.csproj Modules/TypeEdgeModule3/
COPY TypeEdgeML.Shared/TypeEdgeML.Shared.csproj TypeEdgeML.Shared/
COPY NuGet.Config ./
RUN dotnet restore Modules/TypeEdgeModule3/TypeEdgeModule3.csproj
COPY . .
WORKDIR /src/Modules/TypeEdgeModule3

Просмотреть файл

@ -34,7 +34,6 @@ COPY Modules/TypeEdgeModule1/TypeEdgeModule1.csproj Modules/TypeEdgeModule1/
COPY Modules/TypeEdgeModule2/TypeEdgeModule2.csproj Modules/TypeEdgeModule2/
COPY Modules/TypeEdgeModule3/TypeEdgeModule3.csproj Modules/TypeEdgeModule3/
COPY NuGet.Config ./
RUN dotnet restore TypeEdgeML.Emulator/TypeEdgeML.Emulator.csproj
COPY . .
COPY ./.env Thermostat.Emulator/