Skip to content

Commit 86569e9

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Update stylecop
1 parent 541a3c8 commit 86569e9

File tree

7 files changed

+24
-28
lines changed

7 files changed

+24
-28
lines changed

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -278,24 +278,18 @@
278278
</Content>
279279
<Content Include="Configurator\Views\textfield.htm" />
280280
</ItemGroup>
281-
<ItemGroup>
282-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
283-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
284-
</ItemGroup>
285281
<ItemGroup>
286282
<ProjectReference Include="..\UmbracoFileSystemProviders.Azure\UmbracoFileSystemProviders.Azure.csproj">
287283
<Project>{749bc432-144a-4250-9066-d1fe170afe42}</Project>
288284
<Name>UmbracoFileSystemProviders.Azure</Name>
289285
</ProjectReference>
290286
</ItemGroup>
287+
<ItemGroup>
288+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
289+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
290+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
291+
</ItemGroup>
291292
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
292-
<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')" />
293-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
294-
<PropertyGroup>
295-
<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>
296-
</PropertyGroup>
297-
<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'))" />
298-
</Target>
299293
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
300294
Other similar extension points exist, see Microsoft.Common.targets.
301295
<Target Name="BeforeBuild">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
3030
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3131
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
32-
<package id="StyleCop.Analyzers" version="1.0.0-beta014" targetFramework="net45" developmentDependency="true" />
32+
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
3333
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
3434
<package id="UmbracoCms.Core" version="7.1.9" targetFramework="net45" />
3535
<package id="WindowsAzure.Storage" version="6.2.0" targetFramework="net45" />

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<None Include="FileSystemProviders.default.config" />
263263
<None Include="FileSystemProviders.upgrade.config" />
264264
<None Include="packages.config" />
265-
<None Include="stylecop.json" />
265+
<AdditionalFiles Include="stylecop.json" />
266266
</ItemGroup>
267267
<ItemGroup>
268268
<ProjectReference Include="..\UmbracoFileSystemProviders.Azure.Installer\UmbracoFileSystemProviders.Azure.Installer.csproj">
@@ -275,17 +275,11 @@
275275
</ProjectReference>
276276
</ItemGroup>
277277
<ItemGroup>
278-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
279-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
278+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
279+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
280+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
280281
</ItemGroup>
281282
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
282-
<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')" />
283-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
284-
<PropertyGroup>
285-
<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>
286-
</PropertyGroup>
287-
<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'))" />
288-
</Target>
289283
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
290284
Other similar extension points exist, see Microsoft.Common.targets.
291285
<Target Name="BeforeBuild">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3030
<package id="NUnit" version="2.6.4" targetFramework="net45" />
3131
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
32-
<package id="StyleCop.Analyzers" version="1.0.0-beta014" targetFramework="net45" developmentDependency="true" />
32+
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
3333
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
3434
<package id="UmbracoCms.Core" version="7.1.9" targetFramework="net45" />
3535
<package id="WindowsAzure.Storage" version="6.2.0" targetFramework="net45" />

‎src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Copyright (c) James Jackson-South, Jeavon Leopold, and contributors. All rights reserved.
33
// Licensed under the Apache License, Version 2.0.
44
// </copyright>
5+
56
namespace Our.Umbraco.FileSystemProviders.Azure
67
{
78
using System;
@@ -66,7 +67,7 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
6667
}
6768

6869
/// <summary>
69-
/// Initializes a new instance of the <see cref="AzureBlobFileSystem"/> class
70+
/// Initializes a new instance of the <see cref="AzureBlobFileSystem"/> class
7071
/// from values in application settings.
7172
/// </summary>
7273
public AzureBlobFileSystem()

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,18 @@
268268
<AdditionalFiles Include="stylecop.json" />
269269
</ItemGroup>
270270
<ItemGroup>
271-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
272-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
273-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
271+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
272+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
273+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
274274
</ItemGroup>
275275
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
276+
<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')" />
277+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
278+
<PropertyGroup>
279+
<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>
280+
</PropertyGroup>
281+
<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'))" />
282+
</Target>
276283
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
277284
Other similar extension points exist, see Microsoft.Common.targets.
278285
<Target Name="BeforeBuild">

‎src/UmbracoFileSystemProviders.Azure/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
2828
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2929
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
30-
<package id="StyleCop.Analyzers" version="1.0.0-rc3" targetFramework="net45" developmentDependency="true" />
30+
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
3131
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
3232
<package id="UmbracoCms.Core" version="7.1.9" targetFramework="net45" />
3333
<package id="WindowsAzure.Storage" version="6.2.0" targetFramework="net45" />

0 commit comments

Comments
 (0)