Skip to content

Commit

Permalink
Added build folder, fixed project file, release v0.7.7
Browse files Browse the repository at this point in the history
  • Loading branch information
RicoSuter committed Nov 20, 2015
1 parent d0335af commit eb45a7d
Show file tree
Hide file tree
Showing 52 changed files with 28 additions and 196 deletions.
7 changes: 1 addition & 6 deletions Installation.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
How to use the source code:

- Before opening the solution, run the RestorePackages.bat file

Explanation:
The Exceptional.csproj needs a ReSharper msbuild target file which is available
in the NuGet package. The NuGet package is not stored in the Git repository,
this is why you need to restore the packages before you can build the project.
- **Before opening the solution, run the `build/00_RestorePackages.bat` file.** Explanation: The Exceptional.csproj needs a ReSharper msbuild target file which is available in the NuGet package. The NuGet package is not stored in the Git repository, this is why you need to restore the packages before you can build the project.

How to debug the extension:
IMPORTANT: Uninstall the "Exceptional" extension first
Expand Down
10 changes: 3 additions & 7 deletions src/Build.bat → build/00_RestorePackages.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
cd NuGet

nuget.exe restore ../Exceptional.sln
msbuild ../Exceptional.sln /p:Configuration=Release /t:rebuild
nuget.exe restore ../src/Exceptional.sln
msbuild ../src/Exceptional.sln /p:Configuration=Release /t:rebuild

nuget.exe pack Exceptional.R8.nuspec -OutputDirectory "Packages"
nuget.exe pack Exceptional.R9.nuspec -OutputDirectory "Packages"
nuget.exe pack Exceptional.R10.nuspec -OutputDirectory "Packages"

cd ..
nuget.exe pack Exceptional.R10.nuspec -OutputDirectory "Packages"
2 changes: 2 additions & 0 deletions build/01_Build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nuget.exe restore ../src/Exceptional.sln
msbuild ../src/Exceptional.sln /p:Configuration=Release /t:rebuild
3 changes: 3 additions & 0 deletions build/02_CreatePackages.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nuget.exe pack Exceptional.R8.nuspec -OutputDirectory "Packages"
nuget.exe pack Exceptional.R9.nuspec -OutputDirectory "Packages"
nuget.exe pack Exceptional.R10.nuspec -OutputDirectory "Packages"
6 changes: 6 additions & 0 deletions build/03_PushPackages.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set /p apiKey=NuGet API Key:
set /p version=Package Version:

nuget.exe push Packages/Exceptional.%version%.nupkg %apiKey% -source https://resharper-plugins.jetbrains.com/api/curated-feeds/Wave_v4.0/
nuget.exe push Packages/Exceptional.R9.%version%.nupkg %apiKey% -source https://resharper-plugins.jetbrains.com/api/curated-feeds/Wave_v4.0/
nuget.exe push Packages/Exceptional.R10.%version%.nupkg %apiKey% -source https://resharper-plugins.jetbrains.com/api/v2/curated-feeds/Wave_v4.0/
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>Exceptional.R10</id>
<version>0.7.6.0</version>
<version>0.7.7.0</version>
<title>Exceptional for ReSharper 10</title>
<description>Analyzes thrown and documented C# exceptions and suggests improvements. </description>
<authors>ExceptionalDevs</authors>
Expand All @@ -14,6 +14,6 @@
</dependencies>
</metadata>
<files>
<file src="..\Exceptional.R10\bin\Release\ReSharper.Exceptional.R10.dll" target="DotFiles" />
<file src="..\src\Exceptional.R10\bin\Release\ReSharper.Exceptional.R10.dll" target="DotFiles" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>Exceptional</id>
<version>0.7.6.0</version>
<version>0.7.7.0</version>
<title>Exceptional for ReSharper 8</title>
<description>Analyzes thrown and documented C# exceptions and suggests improvements. </description>
<authors>ExceptionalDevs</authors>
Expand All @@ -14,6 +14,6 @@
</dependencies>
</metadata>
<files>
<file src="..\Exceptional.R8\bin\Release\ReSharper.Exceptional.R8.dll" target="ReSharper\v8.2\plugins" />
<file src="..\src\Exceptional.R8\bin\Release\ReSharper.Exceptional.R8.dll" target="ReSharper\v8.2\plugins" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>Exceptional.R9</id>
<version>0.7.6.0</version>
<version>0.7.7.0</version>
<title>Exceptional for ReSharper 9</title>
<description>Analyzes thrown and documented C# exceptions and suggests improvements. </description>
<authors>ExceptionalDevs</authors>
Expand All @@ -14,6 +14,6 @@
</dependencies>
</metadata>
<files>
<file src="..\Exceptional.R9\bin\Release\ReSharper.Exceptional.R9.dll" target="DotFiles" />
<file src="..\src\Exceptional.R9\bin\Release\ReSharper.Exceptional.R9.dll" target="DotFiles" />
</files>
</package>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added build/Packages/Exceptional.0.7.7.0.nupkg
Binary file not shown.
Binary file added build/Packages/Exceptional.R10.0.7.7.0.nupkg
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added build/Packages/Exceptional.R9.0.7.7.0.nupkg
Binary file not shown.
144 changes: 0 additions & 144 deletions src/.nuget/NuGet.targets

This file was deleted.

4 changes: 0 additions & 4 deletions src/.nuget/packages.config

This file was deleted.

18 changes: 6 additions & 12 deletions src/Exceptional.R10/Exceptional.R10.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="antlr.runtime, Version=2.7.7.1, Culture=neutral, PublicKeyToken=0f493c87b190d7e9, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Antlr2.Runtime.2.7.7.02\lib\antlr.runtime.dll</HintPath>
</Reference>
<Reference Include="AsyncBridge.Net35, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b3b1c0202c0d6a87, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AsyncBridge.Net35.0.2.0\lib\net35-Client\AsyncBridge.Net35.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
Expand All @@ -95,8 +91,8 @@
<Private>True</Private>
</Reference>
<Reference Include="Ionic.Zip.Reduced, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\DotNetZip.Reduced.1.9.1.8\lib\net20\Ionic.Zip.Reduced.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="JbUnixUtils, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
<HintPath>..\packages\JetBrains.Unix.Utils.20150702.4\lib\net40\JbUnixUtils.dll</HintPath>
Expand All @@ -123,8 +119,8 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Windows7APICodePack.JetBrains.Stripped.1.1.20150225.0\lib\Net\Microsoft.WindowsAPICodePack.dll</HintPath>
Expand All @@ -139,8 +135,8 @@
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft35.Json.7.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NuGet.Core, Version=2.8.60717.93, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Core.2.8.6\lib\net40-Client\NuGet.Core.dll</HintPath>
Expand All @@ -155,16 +151,16 @@
<HintPath>..\packages\NUnit.Core.2.6.4\lib\nunit.core.interfaces.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.Core.2.6.4\lib\nunit.util.dll</HintPath>
</Reference>
<Reference Include="NVelocity, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NVelocity.1.0.3\lib\NVelocity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
Expand Down Expand Up @@ -453,12 +449,10 @@
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
<Error Condition="!Exists('..\packages\Antlr2.Tools.2.7.6.4\build\Antlr2.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr2.Tools.2.7.6.4\build\Antlr2.Tools.targets'))" />
<Error Condition="!Exists('..\packages\JetBrains.Build.Platform.Tasks.ThemedIconsPacker.2.0.20150812.0\build\JetBrains.Build.Platform.Tasks.ThemedIconsPacker.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.Build.Platform.Tasks.ThemedIconsPacker.2.0.20150812.0\build\JetBrains.Build.Platform.Tasks.ThemedIconsPacker.Targets'))" />
<Error Condition="!Exists('..\packages\JetBrains.Platform.Core.Shell.104.0.20151101.164331\build\JetBrains.Platform.Core.Shell.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.Platform.Core.Shell.104.0.20151101.164331\build\JetBrains.Platform.Core.Shell.Targets'))" />
Expand Down
Loading

0 comments on commit eb45a7d

Please sign in to comment.