Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Commit 2879f52

Browse files
peterfeltspeterfelts
authored
Jan 2020 dependency updates. (#368)
* Jan 2020 dependency updates. * Updating docs to reference a specific version of Dotnet Core. * Specifying a specific version of dotnet in the travis config file.
1 parent 1ada7f4 commit 2879f52

File tree

10 files changed

+64
-29
lines changed

10 files changed

+64
-29
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
2+
dotnet: 2.1.607
33
mono: none
44
sudo: false
55
cache:

‎PartitioningAgent.Test/PartitioningAgent.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
9-
<PackageReference Include="Moq" Version="4.10.1" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
9+
<PackageReference Include="Moq" Version="4.13.1" />
1010
<PackageReference Include="xunit" Version="2.4.1" />
1111
<PackageReference Include="xunit.assert" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.console" Version="2.4.1" />

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The service can be started from any C# IDE and from the command line.
6666
The only difference you might notice is how environment variables
6767
are configured. See the [Configuration and Environment variables](#configuration-and-environment-variables) documentation below for more information.
6868

69-
1. [Install .NET Core 2.x][dotnet-install]
69+
1. [Install .NET Core SDK 2.1.607][dotnet-install]
7070
1. Install any recent edition of Visual Studio (Windows/MacOS) or Visual
7171
Studio Code (Windows/MacOS/Linux).
7272
1. Create an instance of [Azure IoT Hub][iothub-url].
@@ -208,7 +208,7 @@ https://github.com/Azure/device-simulation-dotnet/issues.
208208
[postman-url]: https://www.getpostman.com
209209
[wiki-createsim-url]: https://github.com/Azure/device-simulation-dotnet/wiki/%5BAPI-Specifications%5D-Simulations#create-default-simulation
210210
[vs-install-url]: https://www.visualstudio.com/downloads
211-
[dotnet-install]: https://www.microsoft.com/net/learn/get-started
211+
[dotnet-install]: https://dotnet.microsoft.com/download/dotnet-core/2.1
212212
[windows-envvars-howto-url]: https://superuser.com/questions/949560/how-do-i-set-system-environment-variables-in-windows-10
213213
[docker-compose-install-url]: https://docs.docker.com/compose/install
214214

‎Services.Test/Services.Test.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
9-
<PackageReference Include="Moq" Version="4.10.1" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
9+
<PackageReference Include="Moq" Version="4.13.1" />
1010
<PackageReference Include="xunit" Version="2.4.1" />
1111
<PackageReference Include="xunit.assert" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518
<ItemGroup>
1619
<ProjectReference Include="..\Services\Services.csproj" />

‎Services/Services.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
</Content>
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Google.Protobuf" Version="3.5.1" />
21-
<PackageReference Include="jint" Version="2.10.4" />
22-
<PackageReference Include="Microsoft.Azure.Devices" Version="1.18.1" />
23-
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.20.3" />
24-
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.1.3" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.1.1" />
27-
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
20+
<PackageReference Include="Google.Protobuf" Version="3.11.2" />
21+
<PackageReference Include="jint" Version="2.11.58" />
22+
<PackageReference Include="Microsoft.Azure.Devices" Version="1.18.2" />
23+
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.21.3" />
24+
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.9.2" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="3.1.0" />
27+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
2828
<PackageReference Include="Upn_Components_Dependencies" Version="1.0.0" />
2929
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
3030
</ItemGroup>

‎SimulationAgent.Test/SimulationAgent.Test.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
9-
<PackageReference Include="Moq" Version="4.10.1" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
9+
<PackageReference Include="Moq" Version="4.13.1" />
1010
<PackageReference Include="xunit" Version="2.4.1" />
1111
<PackageReference Include="xunit.assert" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518
<ItemGroup>
1619
<ProjectReference Include="..\Services\Services.csproj" />

‎WebService.Test/WebService.Test.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1010
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
11-
<PackageReference Include="Moq" Version="4.10.1" />
11+
<PackageReference Include="Moq" Version="4.13.1" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.assert" Version="2.4.1" />
1414
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
1619
</ItemGroup>
1720
<ItemGroup>
1821
<Folder Include="helpers\Http" />

‎WebService/WebService.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
</Content>
3737
</ItemGroup>
3838
<ItemGroup>
39-
<PackageReference Include="Autofac" Version="4.8.1" />
40-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
41-
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.6" />
42-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
43-
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.1.1" />
44-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="2.1.5" />
39+
<PackageReference Include="Autofac" Version="4.9.4" />
40+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="5.0.1" />
41+
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
42+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
43+
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="3.1.0" />
44+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.6.0" />
4545
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
4646
</ItemGroup>
4747
<ItemGroup>

‎global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "2.1.607"
4+
}
5+
}

‎scripts/docker/build.cmd‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ cd %APP_HOME%
2626
:: Restore packages and build the application
2727
call dotnet restore
2828
IF %ERRORLEVEL% NEQ 0 GOTO FAIL
29+
30+
echo.
31+
echo ##############################################
32+
echo ######### Running dotnet build... ############
33+
echo ##############################################
34+
echo.
35+
2936
call dotnet build --configuration %CONFIGURATION%
3037
IF %ERRORLEVEL% NEQ 0 GOTO FAIL
3138

@@ -40,15 +47,29 @@ cd %APP_HOME%
4047

4148
mkdir out\docker\webservice
4249

50+
echo.
51+
echo ##############################################
52+
echo ######### Running dotnet publish... ##########
53+
echo ##############################################
54+
echo.
55+
4356
dotnet publish WebService --configuration %CONFIGURATION% --output bin\Docker
4457

58+
echo.
59+
echo #####################################################################################
60+
echo ####### Copying files from WebService\bin\Docker to out\docker\webservice... ########
61+
echo #####################################################################################
62+
echo.
63+
4564
xcopy /s WebService\bin\Docker\* out\docker\webservice\
4665

66+
echo Copying .dockerignore...
4767
copy scripts\docker\.dockerignore out\docker\
4868
copy scripts\docker\Dockerfile out\docker\
4969
copy scripts\docker\content\run.sh out\docker\
5070

5171
cd out\docker\
72+
echo Running docker build...
5273
docker build --compress --tag %DOCKER_TAG% --label "%DOCKER_LABEL2%" .
5374

5475
IF %ERRORLEVEL% NEQ 0 GOTO FAIL

0 commit comments

Comments
 (0)