Skip to content

Commit 4c2b4ae

Browse files
leotsarevleotsarev
committed
Consolidate and update build
1 parent 2ca69b8 commit 4c2b4ae

File tree

11 files changed

+53
-388
lines changed

11 files changed

+53
-388
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1313
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1414
<PackageProjectUrl>https://github.com/leotsarev/hardcode-analyzer</PackageProjectUrl>
15+
<IsPackable>False</IsPackable>
1516

1617
</PropertyGroup>
1718
<!--
@@ -26,4 +27,8 @@
2627
<_Parameter1>$(AssemblyName).Test</_Parameter1>
2728
</AssemblyAttribute>
2829
</ItemGroup>
30+
<ItemGroup>
31+
<PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" PrivateAssets="all" Condition="'$(IsPackable)' == 'true'"/>
32+
</ItemGroup>
33+
2934
</Project>

‎Directory.Build.targets‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<ItemGroup Condition="'$(IsPackable)' == 'true'">
3+
<None Update="tools\*.ps1" CopyToOutputDirectory="Always" Pack="true" PackagePath="tools" />
4+
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
5+
</ItemGroup>
6+
<Target Name="IlRepack" AfterTargets="Build" Condition="'$(IsPackable)' == 'true'">
7+
<ItemGroup>
8+
<InputAssemblies Include="Tsarev.Analyzer.Helpers.dll" />
9+
</ItemGroup>
10+
<ILRepack
11+
Parallel="true" Internalize="False" InputAssemblies="@(InputAssemblies)" OutputType="Dll"
12+
MainAssembly="$(AssemblyName).dll"
13+
OutputAssembly="$(OutputPath)\$(AssemblyName).dll"
14+
WorkingDirectory="$(OutputPath)"
15+
/>
16+
<Delete Files="$(OutputPath)\Tsarev.Analyzer.Helpers.dll" />
17+
</Target>
18+
</Project>

‎HardcodeAnalyzer.sln‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.28729.10
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Hardcode.Url", "Tsarev.Analyzer.Hardcode.Url\Tsarev.Analyzer.Hardcode.Url.csproj", "{256757F2-DA1A-460B-B3B0-C412F7765C16}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Hardcode.Url", "Tsarev.Analyzer.Hardcode.Url\Tsarev.Analyzer.Hardcode.Url.csproj", "{256757F2-DA1A-460B-B3B0-C412F7765C16}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Hardcode.Url.Test", "UrlHardcodeAnalyzer.Test\Tsarev.Analyzer.Hardcode.Url.Test.csproj", "{7EF60AD1-739B-4F59-A4C9-DF70BE016460}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Hardcode.Url.Test", "UrlHardcodeAnalyzer.Test\Tsarev.Analyzer.Hardcode.Url.Test.csproj", "{7EF60AD1-739B-4F59-A4C9-DF70BE016460}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.TestHelpers", "Tsarev.Analyzer.TestHelpers\Tsarev.Analyzer.TestHelpers.csproj", "{7EF60AD1-739B-4F59-A4C9-DF70BE016461}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.TestHelpers", "Tsarev.Analyzer.TestHelpers\Tsarev.Analyzer.TestHelpers.csproj", "{7EF60AD1-739B-4F59-A4C9-DF70BE016461}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Web", "Tsarev.Analyzer.Web\Tsarev.Analyzer.Web.csproj", "{14D5C137-73AD-4848-9C94-20340EAB466B}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Web", "Tsarev.Analyzer.Web\Tsarev.Analyzer.Web.csproj", "{14D5C137-73AD-4848-9C94-20340EAB466B}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Helpers", "Tsarev.Analyzer.Helpers\Tsarev.Analyzer.Helpers.csproj", "{C408D80B-8A40-4B31-B894-941039EB12D0}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Helpers", "Tsarev.Analyzer.Helpers\Tsarev.Analyzer.Helpers.csproj", "{C408D80B-8A40-4B31-B894-941039EB12D0}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Web.Test", "Tsarev.Analyzer.Web.Test\Tsarev.Analyzer.Web.Test.csproj", "{244E02C2-9DAA-4F34-AA5D-5EF305219ADB}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Web.Test", "Tsarev.Analyzer.Web.Test\Tsarev.Analyzer.Web.Test.csproj", "{244E02C2-9DAA-4F34-AA5D-5EF305219ADB}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{456FDA75-295D-4446-8A26-55066E46B24A}"
1919
ProjectSection(SolutionItems) = preProject
2020
.editorconfig = .editorconfig
2121
appveyor.yml = appveyor.yml
2222
Directory.Build.props = Directory.Build.props
23+
Directory.Build.targets = Directory.Build.targets
2324
EndProjectSection
2425
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Hardcode.Guid", "Tsarev.Analyzer.Hardcode.Guid\Tsarev.Analyzer.Hardcode.Guid.csproj", "{F985F745-8C23-4268-AB4B-49895EA465C1}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Hardcode.Guid", "Tsarev.Analyzer.Hardcode.Guid\Tsarev.Analyzer.Hardcode.Guid.csproj", "{F985F745-8C23-4268-AB4B-49895EA465C1}"
2627
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Hardcode.Guid.Test", "Tsarev.Analyzer.Hardcode.Guid.Test\Tsarev.Analyzer.Hardcode.Guid.Test.csproj", "{A9EDEBB1-8D09-43D3-B0DD-B7D78F405E85}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Hardcode.Guid.Test", "Tsarev.Analyzer.Hardcode.Guid.Test\Tsarev.Analyzer.Hardcode.Guid.Test.csproj", "{A9EDEBB1-8D09-43D3-B0DD-B7D78F405E85}"
2829
EndProject
2930
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{A4C875FB-2038-438D-97CF-2953A2F89473}"
3031
EndProject
3132
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hardcode", "Hardcode", "{06D9E499-7167-4C8F-A6EC-3A1390C0F79E}"
3233
EndProject
33-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Hardcode.Email", "Tsarev.Analyzer.Hardcode.Email\Tsarev.Analyzer.Hardcode.Email.csproj", "{F75815ED-B3B6-4A9B-B06E-9625B8F4D13A}"
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Hardcode.Email", "Tsarev.Analyzer.Hardcode.Email\Tsarev.Analyzer.Hardcode.Email.csproj", "{F75815ED-B3B6-4A9B-B06E-9625B8F4D13A}"
3435
EndProject
35-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tsarev.Analyzer.Hardcode.Email.Test", "Tsarev.Analyzer.Hardcode.Email.Test\Tsarev.Analyzer.Hardcode.Email.Test.csproj", "{4E74A79F-74BC-49CF-9330-C1EAFCE07E42}"
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tsarev.Analyzer.Hardcode.Email.Test", "Tsarev.Analyzer.Hardcode.Email.Test\Tsarev.Analyzer.Hardcode.Email.Test.csproj", "{4E74A79F-74BC-49CF-9330-C1EAFCE07E42}"
3637
EndProject
3738
Global
3839
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Tsarev.Analyzer.Exceptions.Test/ExceptionTest.cs‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎Tsarev.Analyzer.Exceptions.Test/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Tsarev.Analyzer.Exceptions.Test/Tsarev.Analyzer.Exceptions.Test.csproj‎

Lines changed: 0 additions & 121 deletions
This file was deleted.

‎Tsarev.Analyzer.Exceptions.Test/packages.config‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)