Skip to content

Update 'Microsoft.PowerShell.CoreCLR.Eventing' to resolve conflict with 'System.Diagnostics.EventLog' #10305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 4 commits into from
Aug 8, 2019
Merged

Update 'Microsoft.PowerShell.CoreCLR.Eventing' to resolve conflict with 'System.Diagnostics.EventLog' #10305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2871b1d
Update 'Microsoft.PowerShell.CoreCLR.Eventing' to resolve conflicts
daxian-dbw Aug 5, 2019
2f3035a
Fix two build issues
daxian-dbw Aug 6, 2019
fbff833
Add reference to 'System.Diagnostics.EventLog' to build Microsoft.Pow…
daxian-dbw Aug 6, 2019
e457bb0
Stop compiling Get/New-WinEvent on Unix
daxian-dbw Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3042,6 +3042,15 @@
<Component Id="cmpCE991A76187F47148F1854BC02E3524E" Guid="{39a0126f-44e9-471a-83d6-139d1636e79a}">
<File Id="fil199A45B24AFE4650B2EB5A3C3E7EC0BE" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.dll" />
</Component>
<Component Id="cmpAD1A205D445C43588868B205091DD390" Guid="{6b4a76d4-d968-40ee-bac1-abdb3d01b442}">
<File Id="filFC6F2DCBA0D549999D96D3624406804E" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Reflection.Context.dll" />
</Component>
<Component Id="cmpD7A187ADE66347E5A7550B96BA10D493" Guid="{410b2d6d-2158-4e70-a970-37b2f14e3e82}">
<File Id="filEEF618E0250F4B8CBFE951C2A7E5C018" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Data.OleDb.dll" />
</Component>
<Component Id="cmp827B25EEC28D4699BB29042B273C8CBF" Guid="{f7ccc70c-5aaf-4e6b-bf9f-c59f4e631f9c}">
<File Id="filEF6B07EDBC8F43AE8DF88CFDF798FC22" KeyPath="yes" Source="$(env.ProductSourcePath)\System.ComponentModel.Composition.Registration.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
Expand Down Expand Up @@ -3876,6 +3885,9 @@
<ComponentRef Id="cmp765A784AADA742928B4E6376ABB7EF28" />
<ComponentRef Id="cmpC6C53A5B540B4A3C9624A0D14D5A9790" />
<ComponentRef Id="cmp6A48FC0DE86C41C297EC418A0E49CA2C" />
<ComponentRef Id="cmpAD1A205D445C43588868B205091DD390" />
<ComponentRef Id="cmpD7A187ADE66347E5A7550B96BA10D493" />
<ComponentRef Id="cmp827B25EEC28D4699BB29042B273C8CBF" />
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 1 addition & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2191,14 +2191,14 @@ function Start-CrossGen {
"Microsoft.PowerShell.Commands.Utility.dll",
"Microsoft.PowerShell.Commands.Management.dll",
"Microsoft.PowerShell.Security.dll",
"Microsoft.PowerShell.CoreCLR.Eventing.dll",
"Microsoft.PowerShell.ConsoleHost.dll",
"System.Management.Automation.dll"
)

# Add Windows specific libraries
if ($Environment.IsWindows) {
$psCoreAssemblyList += @(
"Microsoft.PowerShell.CoreCLR.Eventing.dll",
"Microsoft.WSMan.Management.dll",
"Microsoft.WSMan.Runtime.dll",
"Microsoft.PowerShell.Commands.Diagnostics.dll",
Expand Down
5 changes: 5 additions & 0 deletions ...icrosoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@
<Compile Remove="gen\GetEventResources.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(IsWindows)' != 'true' ">
<Compile Remove="GetEventCommand.cs" />
<Compile Remove="NewWinEventCommand.cs" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview7.19362.9" />
</ItemGroup>

</Project>
44 changes: 0 additions & 44 deletions src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/EventBookmark.cs
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/EventKeyword.cs
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/EventLevel.cs
View file
Open in desktop

This file was deleted.

Loading