Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Add System.Management #24719

Merged
merged 30 commits into from
Oct 25, 2017
Merged

Add System.Management #24719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5c4a004
First pass building
Oct 12, 2017
6a3c28e
Remove Instrumentation and WMIGenerator
Oct 12, 2017
feea27d
Resources to as used on CoreFX
Oct 13, 2017
21101b3
Removed hard coded path to load wminet_utils
Oct 14, 2017
d5f1883
Added ref, sln, and single basic test
Oct 16, 2017
19682f8
Add CoreFX source header
Oct 16, 2017
05955f7
Removing unused using directives
Oct 16, 2017
b5d798f
clean src proj references
Oct 16, 2017
d890ffa
A bit more test coverage (19%)
Oct 16, 2017
56a1dfb
Sanitizer pass with default settings
Oct 16, 2017
044e488
Adding WMIGenerator
Oct 16, 2017
63815fc
Missing files from previous commit
Oct 16, 2017
f41d64d
Some extra clean-up missed by SSS
Oct 17, 2017
c475b1a
Removing #ifdef dead code
Oct 17, 2017
419d38e
Add pkg project
Oct 17, 2017
16e0b4b
Removing more dead code
Oct 17, 2017
f73ae4d
Removing dead code and small improvement to tests
Oct 18, 2017
97f5bdc
Suppress CA1821 when generating PNSE assembly
Oct 18, 2017
ac1af85
Source changes from CR (so far)
Oct 19, 2017
2905a47
Targets and package issues
Oct 19, 2017
9bfed07
Go back to project targets and settings
Oct 21, 2017
e11b047
Description for the System.Management package.
Oct 21, 2017
de1076e
Match supported pkg frameworks
Oct 21, 2017
04b2693
Skip tests on Windows Nano
Oct 21, 2017
95ef161
Missed files from previous commit
Oct 21, 2017
dc9f3c4
Untabify files and a bit more tests
Oct 24, 2017
703ace4
Generate PNS Assembly for uap
Oct 24, 2017
9578f50
Add references needed by uap for PNS assembly
Oct 24, 2017
4fbe944
PNS assembly message
Oct 24, 2017
0af2486
Fixing package issue
Oct 25, 2017
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
2 changes: 1 addition & 1 deletion src/System.Management/pkg/System.Management.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Management.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>netcoreapp2.0;net45;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this in other libraries? Only 5 libraries already have it.

And System.Drawing.Common.pkproj eg doesn't have net45/net461 either:
<SupportedFramework>netcoreapp2.0</SupportedFramework>

@safern I wonder if all these need regularizing as well.

Copy link
Member

@safern safern Oct 25, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Drawing.Common.pkproj eg doesn't have net45/net461 either.

I'm adding net461 into System.Drawing.Common and also AllXamarinFrameworks in a PR I have open.

UAPvNextTFM I don't think we need it since it will already be netstandard.

Yes, this need regularizing as well from the quick look I just took. I can work with @pjanotti offline to get it according to what we have in the other projects.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per my conversation with Tarek that is my understanding: this needs regularizing.

UAPvNextTFM was added at this moment while adding the PNS assembly for uap, otherwise we hit: "System.Management should not be supported on UAP,Version=v10.0.15138/win10-x86 but has runtime assets "

Alternatively we can keep it closer to System.DirectoryServices.AccountManagement that doesn't have a PNS assembly for uap yet.

That said I want to make this initial commit soon so I can focus more on the test coverage and the sources themselves, so far I've been most of the time dealing with build/packaging issues.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the UapVNextTFM is then needed. However we need netfx facades also. You can merge as is and I can revisit and fix the configurations if you want. But fixing them wouldn’t take us more than 1 hour.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can take this PR as an example: #24758

</ProjectReference>
<ProjectReference Include="..\src\System.Management.csproj" />
<InboxOnTargetFramework Include="net45">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have expected the package index to also contain a change about this new library and where is it inboxed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ops forgot that, also what is the correct version? the smallest possible?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mean the assembly version? If so, we should use whatever is on desktop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was already an entry for System.Management in the packages index, but now with the other changes of build configurations, I've been unable to get a clean local build (yet).

Expand Down
3 changes: 3 additions & 0 deletions src/System.Management/ref/System.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}</ProjectGuid>
<!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref -->
<PackageTargetFramework>netcoreapp2.0;$(UAPvNextTFM)</PackageTargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System.Management.cs" />
<SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.CodeDom\ref\System.CodeDom.csproj" />
Expand Down