Skip to content

Commit 261a365

Browse files
JeavonJeavon
committed
Merge branch 'develop' into feature/InstallerConnectionCheck
2 parents 5fdddb9 + 6bfbb7c commit 261a365

File tree

5 files changed

+32
-2
lines changed

5 files changed

+32
-2
lines changed

‎src/UmbracoFileSystemProviders.Azure.Installer/stylecop.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"settings": {
44
"documentationRules": {
55
"companyName": "James Jackson-South",
6-
"copyrightText": "Copyright (c) {companyName}. All rights reserved. Licensed under the Apache License, Version 2.0."
6+
"copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the Apache License, Version 2.0."
77
}
88
}
99
}

‎src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1618
</PropertyGroup>
1719
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1820
<DebugSymbols>true</DebugSymbols>
@@ -142,10 +144,12 @@
142144
<Private>True</Private>
143145
<HintPath>..\packages\UmbracoCms.Core.6.2.5\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
144146
</Reference>
147+
<Reference Include="System.Net.Http" />
145148
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146149
<Private>True</Private>
147150
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
148151
</Reference>
152+
<Reference Include="System.Net.Http.WebRequest" />
149153
<Reference Include="System.Spatial, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
150154
<SpecificVersion>False</SpecificVersion>
151155
<HintPath>..\packages\System.Spatial.5.6.2\lib\net40\System.Spatial.dll</HintPath>
@@ -248,7 +252,18 @@
248252
<Name>UmbracoFileSystemProviders.Azure</Name>
249253
</ProjectReference>
250254
</ItemGroup>
255+
<ItemGroup>
256+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
257+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
258+
</ItemGroup>
251259
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
260+
<Import Project="..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets" Condition="Exists('..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets')" />
261+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
262+
<PropertyGroup>
263+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
264+
</PropertyGroup>
265+
<Error Condition="!Exists('..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets'))" />
266+
</Target>
252267
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
253268
Other similar extension points exist, see Microsoft.Common.targets.
254269
<Target Name="BeforeBuild">

‎src/UmbracoFileSystemProviders.Azure.Tests/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<package id="Microsoft.Data.Edm" version="5.6.2" targetFramework="net45" />
1717
<package id="Microsoft.Data.OData" version="5.6.2" targetFramework="net45" />
1818
<package id="Microsoft.Data.Services.Client" version="5.6.2" targetFramework="net45" />
19+
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
1920
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2021
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
2122
<package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
@@ -24,6 +25,7 @@
2425
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
2526
<package id="NUnit" version="2.6.4" targetFramework="net45" />
2627
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
28+
<package id="StyleCop.Analyzers" version="1.0.0-beta014" targetFramework="net45" developmentDependency="true" />
2729
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
2830
<package id="UmbracoCms.Core" version="6.2.5" targetFramework="net45" />
2931
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />

‎src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1618
</PropertyGroup>
1719
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1820
<DebugSymbols>true</DebugSymbols>
@@ -263,8 +265,18 @@
263265
<None Include="app.config" />
264266
<None Include="packages.config" />
265267
</ItemGroup>
266-
<ItemGroup />
268+
<ItemGroup>
269+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
270+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
271+
</ItemGroup>
267272
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
273+
<Import Project="..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets" Condition="Exists('..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets')" />
274+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
275+
<PropertyGroup>
276+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
277+
</PropertyGroup>
278+
<Error Condition="!Exists('..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.Analyzers.1.0.0-beta014\build\StyleCop.Analyzers.targets'))" />
279+
</Target>
268280
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
269281
Other similar extension points exist, see Microsoft.Common.targets.
270282
<Target Name="BeforeBuild">

‎src/UmbracoFileSystemProviders.Azure/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
2424
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
2525
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
26+
<package id="StyleCop.Analyzers" version="1.0.0-beta014" targetFramework="net45" developmentDependency="true" />
2627
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
2728
<package id="UmbracoCms.Core" version="6.2.5" targetFramework="net45" />
2829
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />

0 commit comments

Comments
 (0)