Skip to content

Commit

Permalink
Merge commit '7645dc43aeea02accc3c69aedd8087100f81530e' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
az-iot-builder-01 committed Sep 29, 2015
2 parents 1f66e1f + 7645dc4 commit 236204d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="$(DeviceClientDir)\IAuthenticationMethod.cs" />
<Compile Include="$(DeviceClientDir)\AuthenticationMethodFactory.cs" />
<Compile Include="$(DeviceClientDir)\AuthenticationMethodFactory.cs" />
<Compile Include="$(DeviceClientDir)\Common\ActionItem.cs" />
<Compile Include="$(DeviceClientDir)\Common\Api\ClientApiVersionHelper.cs" />
<Compile Include="$(DeviceClientDir)\Common\Api\IotHubApiResources.cs" />
Expand Down Expand Up @@ -216,10 +216,10 @@
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<DelaySign>true</DelaySign>
<DelaySign>false</DelaySign>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@

// Version information for an assembly follows semantic versioning 1.0.0 (because
// NuGet didn't support semver 2.0.0 before VS 2015). See semver.org for details.
[assembly: AssemblyInformationalVersion("1.0.0-preview-003")]
[assembly: AssemblyInformationalVersion("1.0.0-preview-003-1")]
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<DelaySign>true</DelaySign>
<DelaySign>false</DelaySign>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@

// Version information for an assembly follows semantic versioning 1.0.0 (because
// NuGet didn't support semver 2.0.0 before VS 2015). See semver.org for details.
[assembly: AssemblyInformationalVersion("1.0.0-preview-003")]
[assembly: AssemblyInformationalVersion("1.0.0-preview-003-1")]

0 comments on commit 236204d

Please sign in to comment.