Skip to content

Commit 954abf8

Browse files
batzenbatzen
committed
Fixing CI-build
1 parent c9735c5 commit 954abf8

10 files changed

+52
-28
lines changed

‎.build/Build.cs

+9-5
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,20 @@ protected override void OnBuildInitialized()
100100
.DependsOn(Restore)
101101
.Executes(() => {
102102
MSBuild(s => s
103-
.SetProjectFile(Solution)
103+
.SetProjectFile(RootDirectory / "Snoop.GenericInjector/Snoop.GenericInjector.vcxproj")
104104
.SetConfiguration(Configuration)
105+
.SetTargetPlatform(MSBuildTargetPlatform.Win32)
106+
.DisableRestore()
107+
.SetVerbosity(MSBuildVerbosity.Minimal));
108+
109+
DotNetBuild(s => s
110+
.SetProjectFile(Solution)
111+
.SetConfiguration("CI")
105112
.SetAssemblyVersion(GitVersion.AssemblySemVer)
106113
.SetFileVersion(GitVersion.AssemblySemVer)
107114
.SetInformationalVersion(GitVersion.InformationalVersion)
108115

109-
.SetNodeReuse(false)
110-
.SetMaxCpuCount(1)
111-
.SetRestoreDisableParallel(true)
112-
.SetVerbosity(MSBuildVerbosity.Minimal));
116+
.SetVerbosity(DotNetVerbosity.Minimal));
113117
});
114118

115119
Target Pack => _ => _

‎Directory.build.props

-18
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,4 @@
2222
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
2323
<AutoGenerateBindingRedirects Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">true</AutoGenerateBindingRedirects>
2424
</PropertyGroup>
25-
26-
<!-- Build references -->
27-
<ItemGroup>
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" IncludeAssets="build; native" />
29-
</ItemGroup>
30-
31-
<!-- Analyzer references -->
32-
<ItemGroup>
33-
<PackageReference Include="JetBrains.Annotations" privateAssets="all" includeAssets="build;compile" />
34-
35-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" privateAssets="all" includeAssets="build;analyzers" />
36-
37-
<PackageReference Include="PropertyChangedAnalyzers" privateAssets="all" includeAssets="build;analyzers" />
38-
<!--<PackageReference Include="ReflectionAnalyzers" version="0.1-dev" privateAssets="all" includeAssets="build;analyzers" />-->
39-
40-
<PackageReference Include="StyleCop.Analyzers" privateAssets="all" includeAssets="build;analyzers" />
41-
<PackageReference Include="WpfAnalyzers" privateAssets="all" includeAssets="build;analyzers" />
42-
</ItemGroup>
4325
</Project>

‎Directory.build.targets

+18
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,23 @@
2828
<DebugType>full</DebugType>
2929
</PropertyGroup>
3030

31+
<!-- Build references -->
32+
<ItemGroup>
33+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" IncludeAssets="build; native" />
34+
</ItemGroup>
35+
36+
<!-- Analyzer references -->
37+
<ItemGroup>
38+
<PackageReference Include="JetBrains.Annotations" privateAssets="all" includeAssets="build;compile" />
39+
40+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" privateAssets="all" includeAssets="build;analyzers" />
41+
42+
<!-- <PackageReference Include="PropertyChangedAnalyzers" privateAssets="all" includeAssets="build;analyzers" /> -->
43+
<!--<PackageReference Include="ReflectionAnalyzers" version="0.1-dev" privateAssets="all" includeAssets="build;analyzers" />-->
44+
45+
<PackageReference Include="StyleCop.Analyzers" privateAssets="all" includeAssets="build;analyzers" />
46+
<PackageReference Include="WpfAnalyzers" privateAssets="all" includeAssets="build;analyzers" />
47+
</ItemGroup>
48+
3149
<Target Name="ForceRestore" BeforeTargets="ResolvePackageAssets" DependsOnTargets="Restore" />
3250
</Project>

‎Directory.packages.props

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
<PackageVersion Include="JetBrains.Annotations" Version="2020.*" />
2222

2323
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" version="3.*" />
24-
25-
<PackageVersion Include="PropertyChangedAnalyzers" version="3.*" />
26-
2724
<PackageVersion Include="StyleCop.Analyzers" version="1.*" />
25+
2826
<PackageVersion Include="WpfAnalyzers" version="3.*" />
2927
</ItemGroup>
3028
</Project>

‎Snoop.Console/Snoop.Console.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
</ItemGroup>
2424

2525
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
26-
<Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(OutDir)\Snoop.com&quot; /Y&#xD;&#xA;copy &quot;$(TargetPath).config&quot; &quot;$(OutDir)\Snoop.com.config&quot; /Y" />
26+
<Copy SourceFiles="$(TargetPath)"
27+
DestinationFiles="$(OutDir)\Snoop.com" />
28+
<Copy SourceFiles="$(TargetPath).config"
29+
DestinationFiles="$(OutDir)\Snoop.com.config" />
2730
</Target>
2831
</Project>

‎Snoop.Core/Snoop.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net40;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1;netcoreapp3.0;net40</TargetFrameworks>
44

55
<RootNamespace>Snoop</RootNamespace>
66

‎Snoop.GenericInjector/Directory.build.props

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎Snoop.GenericInjector/Directory.build.targets

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎Snoop.GenericInjector/Snoop.GenericInjector.vcxproj

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
5+
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
6+
</PropertyGroup>
37
<ItemGroup Label="ProjectConfigurations">
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>

‎Snoop.sln

+11
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,41 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", ".build\_build.csp
4040
EndProject
4141
Global
4242
GlobalSection(SolutionConfigurationPlatforms) = preSolution
43+
CI|Any CPU = CI|Any CPU
4344
Debug|Any CPU = Debug|Any CPU
4445
Release|Any CPU = Release|Any CPU
4546
EndGlobalSection
4647
GlobalSection(ProjectConfigurationPlatforms) = postSolution
48+
{ACA9A018-ABF3-4C60-995F-99C4777CED71}.CI|Any CPU.ActiveCfg = Release|Any CPU
49+
{ACA9A018-ABF3-4C60-995F-99C4777CED71}.CI|Any CPU.Build.0 = Release|Any CPU
4750
{ACA9A018-ABF3-4C60-995F-99C4777CED71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4851
{ACA9A018-ABF3-4C60-995F-99C4777CED71}.Debug|Any CPU.Build.0 = Debug|Any CPU
4952
{ACA9A018-ABF3-4C60-995F-99C4777CED71}.Release|Any CPU.ActiveCfg = Release|Any CPU
5053
{ACA9A018-ABF3-4C60-995F-99C4777CED71}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{ACA9A018-ABF3-4C60-995F-99C4777CED75}.CI|Any CPU.ActiveCfg = Release|Any CPU
55+
{ACA9A018-ABF3-4C60-995F-99C4777CED75}.CI|Any CPU.Build.0 = Release|Any CPU
5156
{ACA9A018-ABF3-4C60-995F-99C4777CED75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5257
{ACA9A018-ABF3-4C60-995F-99C4777CED75}.Debug|Any CPU.Build.0 = Debug|Any CPU
5358
{ACA9A018-ABF3-4C60-995F-99C4777CED75}.Release|Any CPU.ActiveCfg = Release|Any CPU
5459
{ACA9A018-ABF3-4C60-995F-99C4777CED75}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{883A18A9-A386-4342-AC95-9AFC34913FCA}.CI|Any CPU.ActiveCfg = Release|Any CPU
61+
{883A18A9-A386-4342-AC95-9AFC34913FCA}.CI|Any CPU.Build.0 = Release|Any CPU
5562
{883A18A9-A386-4342-AC95-9AFC34913FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5663
{883A18A9-A386-4342-AC95-9AFC34913FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
5764
{883A18A9-A386-4342-AC95-9AFC34913FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
5865
{883A18A9-A386-4342-AC95-9AFC34913FCA}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{1E16FD0C-92AA-403D-B949-1F19B96DD3CE}.CI|Any CPU.ActiveCfg = Release|Win32
5967
{1E16FD0C-92AA-403D-B949-1F19B96DD3CE}.Debug|Any CPU.ActiveCfg = Debug|Win32
6068
{1E16FD0C-92AA-403D-B949-1F19B96DD3CE}.Debug|Any CPU.Build.0 = Debug|Win32
6169
{1E16FD0C-92AA-403D-B949-1F19B96DD3CE}.Release|Any CPU.ActiveCfg = Release|Win32
6270
{1E16FD0C-92AA-403D-B949-1F19B96DD3CE}.Release|Any CPU.Build.0 = Release|Win32
71+
{9CD2ABCD-5DCA-49CA-9B29-8DEEF8DEC38D}.CI|Any CPU.ActiveCfg = Release|Any CPU
72+
{9CD2ABCD-5DCA-49CA-9B29-8DEEF8DEC38D}.CI|Any CPU.Build.0 = Release|Any CPU
6373
{9CD2ABCD-5DCA-49CA-9B29-8DEEF8DEC38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6474
{9CD2ABCD-5DCA-49CA-9B29-8DEEF8DEC38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
6575
{9CD2ABCD-5DCA-49CA-9B29-8DEEF8DEC38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
6676
{9CD2ABCD-5DCA-49CA-9B29-8DEEF8DEC38D}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{F26BF9F3-A62E-4F0B-B04B-2A8E333FF5FA}.CI|Any CPU.ActiveCfg = Release|Any CPU
6778
{F26BF9F3-A62E-4F0B-B04B-2A8E333FF5FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6879
{F26BF9F3-A62E-4F0B-B04B-2A8E333FF5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
6980
EndGlobalSection

0 commit comments

Comments
 (0)