Merge commit '23af288cca5f57f45cc945e18a4f45929a3d1dd0' into HEAD

Author: Azure IoT Builder

build.ps1

@@ -18,10 +18,16 @@ Parameters:
     -xamarintests: Runs Xamarin tests. Requires additional SDKs and prerequisite configuration.
     -configuration {Debug|Release}
     -verbosity: Sets the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
-.NOTES
+
 Build will automatically detect if the machine is Windows vs Unix. On Windows development boxes, additional testing on .NET Framework will be performed.
 
-.EXAMPLE 
+The following environment variables can tune the build behavior:
+    - AZURE_IOT_DONOTSIGN: disables delay-signing if set to 'TRUE'
+    - AZURE_IOT_LOCALPACKAGES: the path to the local nuget source. 
+        Add a new source using: `nuget sources add -name MySource -Source <path>`
+        Remove a source using: `nuget sources remove -name MySource`
+
+.EXAMPLE
 .\build
 
 Builds a Debug version of the SDK.
@@ -50,10 +56,30 @@ Param(
     [switch] $e2etests,
     [switch] $stresstests,
     [switch] $xamarintests,
+    [switch] $sign,
     [string] $configuration = "Debug",
     [string] $verbosity = "q"
 )
 
+Function IsWindowsDevelopmentBox()
+{
+    return ([Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT)
+}
+
+Function CheckSignTools()
+{
+    $commands = $("SignDotNetBinary", "SignBinary", "SignNuGetPackage", "SignMSIPackage")
+
+    foreach($command in $commands)
+    {
+        $info = Get-Command $command -ErrorAction SilentlyContinue
+        if ($info -eq $null)
+        {
+            throw "Sign toolset not found: '$command' is missing."
+        }
+    }
+}
+
 Function BuildProject($path, $message) {
 
     $label = "BUILD: --- $message $configuration ---"
@@ -81,14 +107,30 @@ Function BuildPackage($path, $message) {
 
     Write-Host
     Write-Host -ForegroundColor Cyan $label
-    cd (Join-Path $rootDir $path)
 
-    $frameworkArgs = ""
+    $projectPath = Join-Path $rootDir $path
+    cd $projectPath
 
-    & dotnet pack --verbosity $verbosity --configuration $configuration --no-build --include-symbols --include-source --output $localPackages
+    $projectName = (dir (Join-Path $projectPath *.csproj))[0].BaseName
+
+    if ($sign)
+    {
+        Write-Host -ForegroundColor Magenta "`tSigning binaries: $projectName"
+        $filesToSign = dir -Recurse .\bin\Release\$projectName.dll
+        SignDotNetBinary $filesToSign
+    }
 
+    & dotnet pack --verbosity $verbosity --configuration $configuration --no-build --include-symbols --include-source --output $localPackages
+    
     if ($LASTEXITCODE -ne 0) {
-        throw "Build failed: $label"
+        throw "Package failed: $label"
+    }
+
+    if ($sign)
+    {
+        Write-Host -ForegroundColor Magenta "`tSigning package: $projectName"
+        $filesToSign = dir (Join-Path $localPackages "$projectName.nupkg")
+        SignNuGetPackage $filesToSign
     }
 }
 
@@ -122,47 +164,34 @@ Function RunApp($path, $message, $framework="netcoreapp2.0") {
     }
 }
 
-Function IsWindowsDevelopmentBox()
-{  
-    return ([Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT)    
-}
-
 $rootDir = (Get-Item -Path ".\" -Verbose).FullName
 $localPackages = Join-Path $rootDir "bin\pkg"
 $startTime = Get-Date
 $buildFailed = $true
 $errorMessage = ""
 
 try {
+    if ($sign)
+    {
+        CheckSignTools
+    }
+    
     if (-not $nobuild)
     {
         # SDK binaries
         BuildProject shared\src "Shared Assembly"
         BuildProject iothub\device\src "IoT Hub DeviceClient SDK"
-        BuildProject iothub\service\src "IoT Hub ServiceClient SDK"      
+        BuildProject iothub\service\src "IoT Hub ServiceClient SDK"
         BuildProject security\tpm\src "SecurityProvider for TPM"
         BuildProject provisioning\device\src "Provisioning Device Client SDK"
         BuildProject provisioning\transport\amqp\src "Provisioning Transport for AMQP"
         BuildProject provisioning\transport\http\src "Provisioning Transport for HTTP"
         BuildProject provisioning\transport\mqtt\src "Provisioning Transport for MQTT"
         BuildProject provisioning\service\src "Provisioning Service Client SDK"
-
-        # Samples
-        BuildProject iothub\device\samples "IoT Hub DeviceClient Samples"
-        BuildProject iothub\service\samples "IoT Hub ServiceClient Samples"
-        BuildProject provisioning\device\samples "Provisioning Device Client Samples"
-        BuildProject provisioning\service\samples "Provisioning Service Client Samples"
-        BuildProject security\tpm\samples "SecurityProvider for TPM Samples"
-
-        # Xamarin samples (require Android, iOS and UWP SDKs and configured iOS remote)
-        if ($xamarintests)
-        {
-            # TODO #335 - create new Xamarin automated samples/tests
-        }
     }
 
     # Unit Tests require InternalsVisibleTo and can only run in Debug builds.
-    if ((-not $nounittests) -and ($configuration.ToLower() -eq "debug"))
+    if ((-not $nounittests) -and ($configuration.ToUpperInvariant() -eq "DEBUG"))
     {
         Write-Host
         Write-Host -ForegroundColor Cyan "Unit Test execution"
@@ -177,7 +206,7 @@ try {
         RunTests security\tpm\tests "SecurityProvider for TPM Tests"
         RunTests provisioning\service\tests "Provisioning Service Client Tests"
     }
-  
+
     if ((-not $nopackage))
     {
         BuildPackage shared\src "Shared Assembly"
@@ -191,6 +220,25 @@ try {
         BuildPackage provisioning\service\src "Provisioning Service Client SDK"
     }
 
+    if (-not [string]::IsNullOrWhiteSpace($env:AZURE_IOT_LOCALPACKAGES))
+    {
+        Write-Host
+        Write-Host -ForegroundColor Cyan "Preparing local package source"
+        Write-Host
+
+        if (-not (Test-Path $env:AZURE_IOT_LOCALPACKAGES))
+        {
+            throw "Local NuGet package source path invalid: $($env:AZURE_IOT_LOCALPACKAGES)"
+        }
+        
+        # Clear the NuGet cache and the old packages.
+        dotnet nuget locals --clear all
+        Remove-Item $env:AZURE_IOT_LOCALPACKAGES\*.*
+
+        # Copy new packages.
+        copy (Join-Path $rootDir "bin\pkg\*.*") $env:AZURE_IOT_LOCALPACKAGES
+    }
+
     if ($e2etests)
     {
         Write-Host
@@ -200,7 +248,7 @@ try {
         # Override verbosity to display individual test execution.
         $oldVerbosity = $verbosity
         $verbosity = "normal"
-        
+
         RunTests e2e\test "End-to-end tests (NetCoreApp)"
         if (IsWindowsDevelopmentBox)
         {
@@ -209,6 +257,19 @@ try {
         }
 
         $verbosity = $oldVerbosity
+
+        # Samples
+        BuildProject iothub\device\samples "IoT Hub DeviceClient Samples"
+        BuildProject iothub\service\samples "IoT Hub ServiceClient Samples"
+        BuildProject provisioning\device\samples "Provisioning Device Client Samples"
+        BuildProject provisioning\service\samples "Provisioning Service Client Samples"
+        BuildProject security\tpm\samples "SecurityProvider for TPM Samples"
+
+        # Xamarin samples (require Android, iOS and UWP SDKs and configured iOS remote)
+        if ($xamarintests)
+        {
+            # TODO #335 - create new Xamarin automated samples/tests
+        }
     }
 
     if ($stresstests)

e2e/test/E2ETests.csproj

@@ -72,18 +72,12 @@
     <PackageReference Include="Microsoft.Azure.EventHubs" Version="1.0.3" />
   </ItemGroup>
 
-  <!-- 
-    For Debug runs, reference the local SDK build. 
-    Note: To run in Visual Studio, a SLN referencing all projects below is required.
-  -->
-  <!-- TODO: <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> -->
-  <ItemGroup>
+  <ItemGroup Condition=" '$(AZURE_IOT_LOCALPACKAGES)' == '' ">
     <ProjectReference Include="$(RootDir)\iothub\device\src\Microsoft.Azure.Devices.Client.csproj" />
     <ProjectReference Include="$(RootDir)\iothub\service\src\Microsoft.Azure.Devices.csproj" />
     <ProjectReference Include="$(RootDir)\shared\src\Microsoft.Azure.Devices.Shared.csproj" />
   </ItemGroup>
-  <!-- TODO: <ItemGroup Condition=" ('$(Configuration)' == 'Debug') And ( '$(TargetFramework)' != 'net451' ) "> -->
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
+  <ItemGroup Condition=" ('$(AZURE_IOT_LOCALPACKAGES)' == '') And ( '$(TargetFramework)' != 'net451' ) ">
     <ProjectReference Include="$(RootDir)\provisioning\device\src\Microsoft.Azure.Devices.Provisioning.Client.csproj" />
     <ProjectReference Include="$(RootDir)\provisioning\transport\amqp\src\Microsoft.Azure.Devices.Provisioning.Transport.Amqp.csproj" />
     <ProjectReference Include="$(RootDir)\provisioning\transport\http\src\Microsoft.Azure.Devices.Provisioning.Transport.Http.csproj" />
@@ -92,20 +86,18 @@
     <Compile Include="$(RootDir)\security\tpm\samples\SecurityProviderTpmSimulator\SecurityProviderTpmSimulator.cs" />
   </ItemGroup>
 
-  <!-- TODO: For Release runs, reference the latest NuGet packages. 
-  <ItemGroup Condition=" '$(Configuration)' == 'Release' ">
+  <ItemGroup Condition=" '$(AZURE_IOT_LOCALPACKAGES)' != '' ">
     <PackageReference Include="Microsoft.Azure.Devices" Version="1.*" />
     <PackageReference Include="Microsoft.Azure.Devices.Shared" Version="1.*" />
     <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.*" />
   </ItemGroup>
-  <ItemGroup Condition=" ('$(Configuration)' == 'Release') And ( '$(TargetFramework)' != 'net451' ) ">
+  <ItemGroup Condition=" ('$(AZURE_IOT_LOCALPACKAGES.ToUpper())' != '') And ( '$(TargetFramework)' != 'net451' ) ">
     <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Client" Version="1.*" />
     <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Amqp" Version="1.*" />
     <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Http" Version="1.*" />
     <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Mqtt" Version="1.*" />
     <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Security.Tpm" Version="1.*" />
     <ProjectReference Include="$(RootDir)\security\tpm\samples\SecurityProviderTpmSimulator\SecurityProviderTpmSimulator.csproj" />
   </ItemGroup>
-  --> 
 
 </Project>

iothub/device/src/Microsoft.Azure.Devices.Client.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
 
   <!-- delay sign the assembly for Release build -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' AND '$(AZURE_IOT_DONOTSIGN.ToUpper())' != 'TRUE' ">
     <AssemblyOriginatorKeyFile>$(RootDir)\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.6.2</VersionPrefix>
+    <VersionPrefix>1.7.0</VersionPrefix>
     <Title>Microsoft Azure IoT Device Client SDK</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -56,8 +56,8 @@
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
-    <PackageReference Include="System.Net.Http.Formatting.Extension" Version="5.2.3" />
+    <Reference Include="System.Net.Http"/>
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
     <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
   </ItemGroup>
 
@@ -101,4 +101,4 @@
     <PackageReference Condition=" '$(Configuration)' == 'Debug' " Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0-beta2" />
   </ItemGroup>
 
-</Project>
+</Project>

iothub/service/src/Microsoft.Azure.Devices.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
 
   <!-- delay sign the assembly for Release build -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' AND '$(AZURE_IOT_DONOTSIGN.ToUpper())' != 'TRUE' ">
     <AssemblyOriginatorKeyFile>$(RootDir)\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.5.1</VersionPrefix>
+    <VersionPrefix>1.6.0</VersionPrefix>
     <Title>Microsoft Azure IoT Service Client SDK</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -124,8 +124,8 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
-    <PackageReference Include="System.Net.Http.Formatting.Extension" Version="5.2.3" />
+    <Reference Include="System.Net.Http"/>
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
     <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
   </ItemGroup>
 

provisioning/device/src/Microsoft.Azure.Devices.Provisioning.Client.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -10,29 +10,29 @@
   </PropertyGroup>
 
   <!-- delay sign the assembly for Release build -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' AND '$(AZURE_IOT_DONOTSIGN.ToUpper())' != 'TRUE' ">
     <AssemblyOriginatorKeyFile>$(RootDir)\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.2</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <Title>Microsoft Azure IoT Provisioning Device Client SDK</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseUrl>https://github.com/Azure/azure-iot-sdk-csharp/blob/master/LICENSE</PackageLicenseUrl>
     <Description>Provisioning Device Client SDK for Azure IoT Devices</Description>
     <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
     <PackageProjectUrl>https://github.com/Azure/azure-iot-sdk-csharp</PackageProjectUrl>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>Microsoft Azure IoT Provisioning Device Client .NET AMQP MQTT HTTP</PackageTags>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <common>$(RootDir)\common\src</common>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <Compile Include="$(Common)\Logging.Common.cs">
       <Link>Common\Logging.Common.cs</Link>

provisioning/service/src/Microsoft.Azure.Devices.Provisioning.Service.csproj

@@ -13,14 +13,14 @@
   </PropertyGroup>
 
   <!-- delay sign the assembly for Release build -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' AND '$(AZURE_IOT_DONOTSIGN.ToUpper())' != 'TRUE' ">
     <AssemblyOriginatorKeyFile>$(RootDir)\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <Title>Microsoft Azure IoT Provisioning Service Client SDK</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>