Skip to content

Commit 907eb2f

Browse files
briantubriantu
committed
Revert custom actions lambda syntax
1 parent 13a9ff7 commit 907eb2f

File tree

5 files changed

+259
-432
lines changed

5 files changed

+259
-432
lines changed

‎tools/windows/DatadogAgentInstaller/CustomActions.Tests/CustomActions.Tests.csproj‎

Lines changed: 167 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,168 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{848B3918-CCFC-47CA-92EF-763C75EFD16D}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CustomActions.Tests</RootNamespace>
11-
<AssemblyName>CustomActions.Tests</AssemblyName>
12-
<!-- WiX 5 migration: Upgraded from v4.6.2 to v4.7.2 for WixSharp_wix4 compatibility -->
13-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<Deterministic>true</Deterministic>
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
18-
<TargetFrameworkProfile />
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<LangVersion>latest</LangVersion>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<LangVersion>latest</LangVersion>
36-
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
38-
<DebugSymbols>true</DebugSymbols>
39-
<DefineConstants>DEBUG;TRACE</DefineConstants>
40-
<DebugType>full</DebugType>
41-
<PlatformTarget>x64</PlatformTarget>
42-
<LangVersion>latest</LangVersion>
43-
<ErrorReport>prompt</ErrorReport>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
46-
<DebugSymbols>true</DebugSymbols>
47-
<DefineConstants>TRACE</DefineConstants>
48-
<Optimize>true</Optimize>
49-
<DebugType>pdbonly</DebugType>
50-
<PlatformTarget>x64</PlatformTarget>
51-
<LangVersion>latest</LangVersion>
52-
<ErrorReport>prompt</ErrorReport>
53-
</PropertyGroup>
54-
<PropertyGroup>
55-
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
56-
</PropertyGroup>
57-
<ItemGroup>
58-
<!-- WiX 5 migration: Replaced assembly reference with NuGet package -->
59-
<!-- Note: Using 4.0.5 because WixSharp's MakeSfxCA expects DTF assembly version 4.0.0.0 -->
60-
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.5" />
61-
</ItemGroup>
62-
<ItemGroup>
63-
<Reference Include="System" />
64-
<Reference Include="System.ComponentModel.Composition" />
65-
<Reference Include="System.ComponentModel.DataAnnotations" />
66-
<Reference Include="System.Configuration" />
67-
<Reference Include="System.Core" />
68-
<Reference Include="System.DirectoryServices" />
69-
<Reference Include="System.ServiceProcess" />
70-
<Reference Include="System.Xml.Linq" />
71-
<Reference Include="System.Data.DataSetExtensions" />
72-
<Reference Include="Microsoft.CSharp" />
73-
<Reference Include="System.Data" />
74-
<Reference Include="System.Xml" />
75-
</ItemGroup>
76-
<ItemGroup>
77-
<Compile Include="APM\ApmConfigTests.cs" />
78-
<Compile Include="InstallState\InstallStateTests.cs" />
79-
<Compile Include="InstallState\InstallStateTestSetup.cs" />
80-
<Compile Include="ProcessUserCustomActions\BaseProcessUserCustomActionsDomainTests.cs" />
81-
<Compile Include="Flare\FlareUnitTests.cs" />
82-
<Compile Include="IntegrationTests\TestConfig.cs" />
83-
<Compile Include="Logs\ProcessConfigTests.cs" />
84-
<Compile Include="ProcessUserCustomActions\TestDelegate.cs" />
85-
<Compile Include="Process\ProcessConfigTests.cs" />
86-
<Compile Include="Proxy\ProcessConfigTests.cs" />
87-
<Compile Include="Service\ServiceCustomActionTests.cs" />
88-
<Compile Include="Service\ServiceCustomActionsTestSetup.cs" />
89-
<Compile Include="Telemetry\TelemetryUnitTests.cs" />
90-
<Compile Include="SessionTestBaseSetup.cs" />
91-
<Compile Include="ProcessUserCustomActions\ProcessUserCustomActionsDomainClientTests.cs" />
92-
<Compile Include="ProcessUserCustomActions\ProcessUserCustomActionsDomainControllerTests.cs" />
93-
<Compile Include="ProcessUserCustomActions\ProcessUserCustomActionsTestSetup.cs" />
94-
<Compile Include="ProcessUserCustomActions\UserCustomActionsTests.cs" />
95-
<Compile Include="WriteConfigUnitTests.cs" />
96-
<Compile Include="Properties\AssemblyInfo.cs" />
97-
<Compile Include="YamlAssertions\YamlAssertionsTests.cs" />
98-
<Compile Include="Helpers\YamlAssertions.cs" />
99-
<Compile Include="Helpers\YamlAssertionsExtensions.cs" />
100-
<Compile Include="Helpers\YamlExpectationsExtensions.cs" />
101-
<Compile Include="Helpers\YamlExtensions.cs" />
102-
</ItemGroup>
103-
<ItemGroup>
104-
<None Include="app.config" />
105-
<None Include="xunit.runner.json">
106-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
107-
</None>
108-
</ItemGroup>
109-
<ItemGroup>
110-
<ProjectReference Include="..\AgentCustomActions\AgentCustomActions.csproj">
111-
<Project>{1e5b725c-f738-4141-8dae-a8cb2fb1f10e}</Project>
112-
<Name>AgentCustomActions</Name>
113-
</ProjectReference>
114-
<ProjectReference Include="..\CustomActions\CustomActions.csproj">
115-
<Project>{461CE844-4B07-47BA-B2D2-5415ABD36792}</Project>
116-
<Name>CustomActions</Name>
117-
</ProjectReference>
118-
</ItemGroup>
119-
<ItemGroup>
120-
<PackageReference Include="AutoFixture.Xunit2">
121-
<Version>4.18.0</Version>
122-
</PackageReference>
123-
<PackageReference Include="Fare">
124-
<Version>2.2.1</Version>
125-
</PackageReference>
126-
<PackageReference Include="FluentAssertions">
127-
<Version>6.10.0</Version>
128-
</PackageReference>
129-
<PackageReference Include="Moq">
130-
<Version>4.18.4</Version>
131-
</PackageReference>
132-
<PackageReference Include="more.xunit.runner.visualstudio">
133-
<Version>2.3.1</Version>
134-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
135-
<PrivateAssets>all</PrivateAssets>
136-
</PackageReference>
137-
<PackageReference Include="System.Net.Http">
138-
<Version>4.3.4</Version>
139-
</PackageReference>
140-
<PackageReference Include="System.Runtime">
141-
<Version>4.3.1</Version>
142-
</PackageReference>
143-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
144-
<Version>6.0.0</Version>
145-
</PackageReference>
146-
<PackageReference Include="System.Security.Cryptography.Algorithms">
147-
<Version>4.3.1</Version>
148-
</PackageReference>
149-
<PackageReference Include="System.Security.Cryptography.X509Certificates">
150-
<Version>4.3.2</Version>
151-
</PackageReference>
152-
<!-- WiX 5 migration: Replaced WixSharp.bin with WixSharp_wix4 -->
153-
<PackageReference Include="WixSharp_wix4">
154-
<Version>2.12.0</Version>
155-
</PackageReference>
156-
<PackageReference Include="xunit">
157-
<Version>2.4.2</Version>
158-
</PackageReference>
159-
<PackageReference Include="xunit.analyzers">
160-
<Version>1.1.0</Version>
161-
</PackageReference>
162-
<PackageReference Include="YamlDotNet">
163-
<Version>13.0.1</Version>
164-
</PackageReference>
165-
</ItemGroup>
166-
<ItemGroup />
167-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{848B3918-CCFC-47CA-92EF-763C75EFD16D}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>CustomActions.Tests</RootNamespace>
11+
<AssemblyName>CustomActions.Tests</AssemblyName>
12+
<!-- WiX 5 migration: Upgraded from v4.6.2 to v4.7.2 for WixSharp_wix4 compatibility -->
13+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<Deterministic>true</Deterministic>
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
18+
<TargetFrameworkProfile />
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<DefineConstants>DEBUG;TRACE</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
<LangVersion>latest</LangVersion>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
<LangVersion>latest</LangVersion>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
38+
<DebugSymbols>true</DebugSymbols>
39+
<DefineConstants>DEBUG;TRACE</DefineConstants>
40+
<DebugType>full</DebugType>
41+
<PlatformTarget>x64</PlatformTarget>
42+
<LangVersion>latest</LangVersion>
43+
<ErrorReport>prompt</ErrorReport>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
46+
<DebugSymbols>true</DebugSymbols>
47+
<DefineConstants>TRACE</DefineConstants>
48+
<Optimize>true</Optimize>
49+
<DebugType>pdbonly</DebugType>
50+
<PlatformTarget>x64</PlatformTarget>
51+
<LangVersion>latest</LangVersion>
52+
<ErrorReport>prompt</ErrorReport>
53+
</PropertyGroup>
54+
<PropertyGroup>
55+
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
56+
</PropertyGroup>
57+
<ItemGroup>
58+
<!-- WiX 5 migration: Replaced assembly reference with NuGet package -->
59+
<!-- Note: Using 4.0.5 because WixSharp's MakeSfxCA expects DTF assembly version 4.0.0.0 -->
60+
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.5" />
61+
</ItemGroup>
62+
<ItemGroup>
63+
<Reference Include="System" />
64+
<Reference Include="System.ComponentModel.Composition" />
65+
<Reference Include="System.ComponentModel.DataAnnotations" />
66+
<Reference Include="System.Configuration" />
67+
<Reference Include="System.Core" />
68+
<Reference Include="System.DirectoryServices" />
69+
<Reference Include="System.ServiceProcess" />
70+
<Reference Include="System.Xml.Linq" />
71+
<Reference Include="System.Data.DataSetExtensions" />
72+
<Reference Include="Microsoft.CSharp" />
73+
<Reference Include="System.Data" />
74+
<Reference Include="System.Xml" />
75+
</ItemGroup>
76+
<ItemGroup>
77+
<Compile Include="APM\ApmConfigTests.cs" />
78+
<Compile Include="InstallState\InstallStateTests.cs" />
79+
<Compile Include="InstallState\InstallStateTestSetup.cs" />
80+
<Compile Include="ProcessUserCustomActions\BaseProcessUserCustomActionsDomainTests.cs" />
81+
<Compile Include="Flare\FlareUnitTests.cs" />
82+
<Compile Include="IntegrationTests\TestConfig.cs" />
83+
<Compile Include="Logs\ProcessConfigTests.cs" />
84+
<Compile Include="ProcessUserCustomActions\TestDelegate.cs" />
85+
<Compile Include="Process\ProcessConfigTests.cs" />
86+
<Compile Include="Proxy\ProcessConfigTests.cs" />
87+
<Compile Include="Service\ServiceCustomActionTests.cs" />
88+
<Compile Include="Service\ServiceCustomActionsTestSetup.cs" />
89+
<Compile Include="Telemetry\TelemetryUnitTests.cs" />
90+
<Compile Include="SessionTestBaseSetup.cs" />
91+
<Compile Include="ProcessUserCustomActions\ProcessUserCustomActionsDomainClientTests.cs" />
92+
<Compile Include="ProcessUserCustomActions\ProcessUserCustomActionsDomainControllerTests.cs" />
93+
<Compile Include="ProcessUserCustomActions\ProcessUserCustomActionsTestSetup.cs" />
94+
<Compile Include="ProcessUserCustomActions\UserCustomActionsTests.cs" />
95+
<Compile Include="WriteConfigUnitTests.cs" />
96+
<Compile Include="Properties\AssemblyInfo.cs" />
97+
<Compile Include="YamlAssertions\YamlAssertionsTests.cs" />
98+
<Compile Include="Helpers\YamlAssertions.cs" />
99+
<Compile Include="Helpers\YamlAssertionsExtensions.cs" />
100+
<Compile Include="Helpers\YamlExpectationsExtensions.cs" />
101+
<Compile Include="Helpers\YamlExtensions.cs" />
102+
</ItemGroup>
103+
<ItemGroup>
104+
<None Include="app.config" />
105+
<None Include="xunit.runner.json">
106+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
107+
</None>
108+
</ItemGroup>
109+
<ItemGroup>
110+
<ProjectReference Include="..\AgentCustomActions\AgentCustomActions.csproj">
111+
<Project>{1e5b725c-f738-4141-8dae-a8cb2fb1f10e}</Project>
112+
<Name>AgentCustomActions</Name>
113+
</ProjectReference>
114+
<ProjectReference Include="..\CustomActions\CustomActions.csproj">
115+
<Project>{461CE844-4B07-47BA-B2D2-5415ABD36792}</Project>
116+
<Name>CustomActions</Name>
117+
</ProjectReference>
118+
</ItemGroup>
119+
<ItemGroup>
120+
<PackageReference Include="AutoFixture.Xunit2">
121+
<Version>4.18.0</Version>
122+
</PackageReference>
123+
<PackageReference Include="Fare">
124+
<Version>2.2.1</Version>
125+
</PackageReference>
126+
<PackageReference Include="FluentAssertions">
127+
<Version>6.10.0</Version>
128+
</PackageReference>
129+
<PackageReference Include="Moq">
130+
<Version>4.18.4</Version>
131+
</PackageReference>
132+
<PackageReference Include="more.xunit.runner.visualstudio">
133+
<Version>2.3.1</Version>
134+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
135+
<PrivateAssets>all</PrivateAssets>
136+
</PackageReference>
137+
<PackageReference Include="System.Net.Http">
138+
<Version>4.3.4</Version>
139+
</PackageReference>
140+
<PackageReference Include="System.Runtime">
141+
<Version>4.3.1</Version>
142+
</PackageReference>
143+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
144+
<Version>6.0.0</Version>
145+
</PackageReference>
146+
<PackageReference Include="System.Security.Cryptography.Algorithms">
147+
<Version>4.3.1</Version>
148+
</PackageReference>
149+
<PackageReference Include="System.Security.Cryptography.X509Certificates">
150+
<Version>4.3.2</Version>
151+
</PackageReference>
152+
<!-- WiX 5 migration: Replaced WixSharp.bin with WixSharp_wix4 -->
153+
<PackageReference Include="WixSharp_wix4">
154+
<Version>2.12.0</Version>
155+
</PackageReference>
156+
<PackageReference Include="xunit">
157+
<Version>2.4.2</Version>
158+
</PackageReference>
159+
<PackageReference Include="xunit.analyzers">
160+
<Version>1.1.0</Version>
161+
</PackageReference>
162+
<PackageReference Include="YamlDotNet">
163+
<Version>13.0.1</Version>
164+
</PackageReference>
165+
</ItemGroup>
166+
<ItemGroup />
167+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
168168
</Project>

0 commit comments

Comments
 (0)