Skip to content

Commit

Permalink
Update to SDK 2018.2-eap1
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Jul 6, 2018
1 parent 96b2c88 commit 45faebe
Show file tree
Hide file tree
Showing 8 changed files with 221 additions and 210 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## 2018.2.0
- Updated to ReSharper 2018.2

## 2018.1.2
- Fixed removal of parentheses for conditional expressions in interpolated strings. (StyleCop/StyleCop#175)

## 2018.1.1
- Updated to ReSharper 2018.1.1

Expand Down
4 changes: 2 additions & 2 deletions build/.build.csproj
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="0.2.*" />
<PackageReference Include="Nuke.Common" Version="0.5.*" />
<PackageReference Include="GitVersion.CommandLine" Version="4.0.0-beta0011" />
</ItemGroup>

Expand Down
26 changes: 13 additions & 13 deletions build/Build.cs
Expand Up @@ -23,21 +23,21 @@
using Nuke.Common.Git;
using Nuke.Common.Tools.GitVersion;
using Nuke.Common.Tools.NuGet;
using Nuke.Core;
using Nuke.Core.Tooling;
using Nuke.Core.Utilities;
using Nuke.Core.Utilities.Collections;

using static Nuke.Core.IO.HttpTasks;
using static Nuke.Core.IO.SerializationTasks;
using static Nuke.Core.IO.TextTasks;
using Nuke.Common;
using Nuke.Common.Tooling;
using Nuke.Common.Utilities;
using Nuke.Common.Utilities.Collections;

using static Nuke.Common.IO.HttpTasks;
using static Nuke.Common.IO.SerializationTasks;
using static Nuke.Common.IO.TextTasks;
using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
using static Nuke.Common.Tools.NuGet.NuGetTasks;
using static Nuke.Core.Tooling.NuGetPackageResolver;
using static Nuke.Core.IO.FileSystemTasks;
using static Nuke.Core.IO.PathConstruction;
using static Nuke.Core.Logger;
using static Nuke.Core.Tooling.ProcessTasks;
using static Nuke.Common.Tooling.NuGetPackageResolver;
using static Nuke.Common.IO.FileSystemTasks;
using static Nuke.Common.IO.PathConstruction;
using static Nuke.Common.Logger;
using static Nuke.Common.Tooling.ProcessTasks;

// ReSharper disable ArrangeThisQualifier

Expand Down
Binary file added src/StyleCop.ReSharper/Hunspellx64.dll
Binary file not shown.
Binary file added src/StyleCop.ReSharper/Hunspellx86.dll
Binary file not shown.
245 changes: 125 additions & 120 deletions src/StyleCop.ReSharper/StyleCop.ReSharper.csproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/StyleCop.ReSharper/app.config
Expand Up @@ -16,4 +16,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
148 changes: 74 additions & 74 deletions src/StyleCop.ReSharper/packages.config
@@ -1,76 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net45" />
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net45" />
<package id="Appccelerate.StateMachine" version="3.3.0" targetFramework="net45" />
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net45" />
<package id="JetBrains.Build.Platform.Tasks.ProxyToSolutionCompiledTask" version="2.0.20170904.2" targetFramework="net45" developmentDependency="true" />
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net45" developmentDependency="true" />
<package id="JetBrains.ExternalAnnotations" version="10.2.47" targetFramework="net45" />
<package id="JetBrains.MahApps.Metro" version="1.5.0.1" targetFramework="net45" />
<package id="JetBrains.Microsoft.Deployment.Compression.Cab" version="3.11.0" targetFramework="net45" />
<package id="JetBrains.NuGet.Core" version="2.14.1.20180215" targetFramework="net45" />
<package id="JetBrains.NuGet.Frameworks" version="4.5.0.20180215" targetFramework="net45" />
<package id="JetBrains.NuGet.Ultimate" version="4.5.0.20180215" targetFramework="net45" />
<package id="JetBrains.NuGet.Versioning" version="4.5.0.20180215" targetFramework="net45" />
<package id="JetBrains.NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net45" />
<package id="JetBrains.NUnit.ReSharperRunner3" version="3.6.3" targetFramework="net45" />
<package id="JetBrains.Platform.Core.Ide" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Core.MsBuild" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Core.Shell" version="112.0.20180524.161516" targetFramework="net45" />
<package id="JetBrains.Platform.Core.Text" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.CommandLine" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Console" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20170610" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20141005.1" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20170610" targetFramework="net45" />
<package id="JetBrains.Platform.MSBuild.Logger.Api" version="1.0.20170809" targetFramework="net45" />
<package id="JetBrains.Platform.RdProtocol" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Sdk" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.Tests.Framework" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.UIInteractive.Ide" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.UIInteractive.Shell" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.UIInteractive.Text" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Platform.VisualStudio" version="112.0.20180524.162307" targetFramework="net45" />
<package id="JetBrains.Psi.Features.Core" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.Diagramming" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.SolutionBuilder" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.src" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.Tasks" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.test.Framework" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.UIInteractive.Core" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.UIInteractive.Features" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.UIInteractive.SolutionAnalysis" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.UnitTesting" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.Psi.Features.VisualStudio" version="112.0.20180524.163005" targetFramework="net45" />
<package id="JetBrains.ReSharper.SDK" version="2018.1.1" targetFramework="net45" developmentDependency="true" />
<package id="JetBrains.ReSharper.SDK.Internal" version="112.0.20180524.171034" targetFramework="net45" />
<package id="JetBrains.SharpZipLib.Stripped" version="0.87.20170720.14" targetFramework="net45" />
<package id="JetBrains.Should" version="1.1.20" targetFramework="net45" />
<package id="JetBrains.System.Reflection.Metadata" version="20170417.0.0.0" targetFramework="net45" />
<package id="JetBrains.System.Windows.Interactivity" version="3.0.40218.0" targetFramework="net45" />
<package id="JetBrains.Toolset.ScriptSourcesCompiler.Interface" version="1.0.20170420.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net461" />
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net461" />
<package id="Appccelerate.StateMachine" version="3.3.0" targetFramework="net461" />
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
<package id="JetBrains.Build.Platform.Tasks.ProxyToSolutionCompiledTask" version="2.0.20170904.2" targetFramework="net461" developmentDependency="true" />
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net461" developmentDependency="true" />
<package id="JetBrains.ExternalAnnotations" version="10.2.47" targetFramework="net461" />
<package id="JetBrains.MahApps.Metro" version="1.5.0.1" targetFramework="net461" />
<package id="JetBrains.Microsoft.Deployment.Compression.Cab" version="3.11.0" targetFramework="net461" />
<package id="JetBrains.NuGet.Core" version="2.14.1.20180215" targetFramework="net461" />
<package id="JetBrains.NuGet.Frameworks" version="4.5.0.20180215" targetFramework="net461" />
<package id="JetBrains.NuGet.Ultimate" version="4.5.0.20180215" targetFramework="net461" />
<package id="JetBrains.NuGet.Versioning" version="4.5.0.20180215" targetFramework="net461" />
<package id="JetBrains.NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net461" />
<package id="JetBrains.NUnit.ReSharperRunner3" version="3.6.3" targetFramework="net461" />
<package id="JetBrains.Platform.Core.Ide" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Core.MsBuild" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Core.Shell" version="182.0.20180628.123630-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Core.Text" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Interop.CommandLine" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Console" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20170610" targetFramework="net461" />
<package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20141005.1" targetFramework="net461" />
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20170610" targetFramework="net461" />
<package id="JetBrains.Platform.MSBuild.Logger.Api" version="1.0.20170809" targetFramework="net461" />
<package id="JetBrains.Platform.RdProtocol" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Sdk" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.Tests.Framework" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.UIInteractive.Ide" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.UIInteractive.Shell" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.UIInteractive.Text" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Platform.VisualStudio" version="182.0.20180628.124316-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.Core" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.Diagramming" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.SolutionBuilder" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.src" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.Tasks" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.test.Framework" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.UIInteractive.Core" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.UIInteractive.Features" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.UIInteractive.SolutionAnalysis" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.UnitTesting" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.Psi.Features.VisualStudio" version="182.0.20180628.124915-eap01" targetFramework="net461" />
<package id="JetBrains.ReSharper.SDK" version="2018.2.0-eap01" targetFramework="net461" developmentDependency="true" />
<package id="JetBrains.ReSharper.SDK.Internal" version="182.0.20180628.133017-eap01" targetFramework="net461" />
<package id="JetBrains.SharpZipLib.Stripped" version="0.87.20180624.19" targetFramework="net461" />
<package id="JetBrains.Should" version="1.1.20" targetFramework="net461" />
<package id="JetBrains.System.Reflection.Metadata" version="20170417.0.0.0" targetFramework="net461" />
<package id="JetBrains.System.Windows.Interactivity" version="3.0.40218.0" targetFramework="net461" />
<package id="JetBrains.Toolset.ScriptSourcesCompiler.Interface" version="1.0.20170420.0" targetFramework="net461" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net461" />
<package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net461" />
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net461" />
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net461" />
<package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net461" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="NHunspell" version="1.2.5554.16953" targetFramework="net461" />
<package id="NuGet.VisualStudio" version="2.8.5" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="NVelocity" version="1.0.3" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="sharpcompress" version="0.11.6" targetFramework="net45" />
<package id="Sprache.JetBrains" version="2.1.0" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net461" />
<package id="NVelocity" version="1.0.3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net461" />
<package id="Sprache.JetBrains" version="2.1.0" targetFramework="net461" />
<package id="StyleCop" version="5.0.0" targetFramework="net45" />
<package id="StyleCop.CSharp" version="5.0.0" targetFramework="net45" />
<package id="StyleCop.CSharp.Rules" version="5.0.0" targetFramework="net45" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net45" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net461" />
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net40" />
<package id="VSSDK.DTE.8" version="8.0.4" targetFramework="net40" />
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net40" />
Expand All @@ -82,11 +82,11 @@
<package id="VSSDK.VSLangProj.11" version="11.0.4" targetFramework="net40" />
<package id="VSSDK.VSLangProj.8" version="8.0.4" targetFramework="net40" />
<package id="VSSDK.VSLangProj.9" version="9.0.4" targetFramework="net40" />
<package id="Wave" version="12.0.0.0" targetFramework="net45" />
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net45" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net45" />
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net45" />
<package id="xunit.runner.utility" version="2.3.1" targetFramework="net45" />
<package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net45" />
<package id="Wave" version="182.0.0.0-eap01" targetFramework="net461" />
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net461" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net461" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net461" />
<package id="xunit.runner.utility" version="2.3.1" targetFramework="net461" />
<package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net461" />
</packages>

0 comments on commit 45faebe

Please sign in to comment.