Skip to content
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.

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

Fix System.Private.ServiceModel.dll's Uapaot Build. #2012

Merged
merged 1 commit into from
Jun 29, 2017

Conversation

shmao
Copy link
Contributor

@shmao shmao commented Jun 28, 2017

I made the following changes

  1. Removed uapaot-Windows_NT from System.Private.ServiceModel/src/Configurations.props. We should be able to use the uap build for uapaot. We used to have netcore50 only.
  2. Replaced netcore50 with uap in System.Private.ServiceModel.csproj
  3. Added required references when targetgroup==uap.
  4. Added a new package for the above required references.
  5. Fixed some code that not worked with NS2.0.

Fix #2001
Fix #2002
Fix #2003
Fix #2005

Copy link
Member

@dagood dagood left a comment

Choose a reason for hiding this comment

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

I can't comment on the C# changes, but build changes LGTM.

@shmao
Copy link
Contributor Author

shmao commented Jun 28, 2017

@dagood Thanks for reviewing the PR. Do you have any ideas about the following error,

15:49:34 [xUnit] [INFO] - [xUnit.Net-v2 (default)] - No test report file(s) were found with the pattern 'bin/Windows_NT.AnyCPU.Debug//testResults.xml' relative to 'D:\j\workspace\windows_nt_de---f3649c3b' for the testing framework 'xUnit.Net-v2 (default)'. Did you enter a pattern relative to the correct directory? Did you generate the result report(s) for 'xUnit.Net-v2 (default)'?
15:49:34
[xUnit] [ERROR] - No test reports found for the metric 'xUnit.Net' with the resolved pattern 'bin/Windows_NT.AnyCPU.Debug/
/testResults.xml'. Configuration error?.

The tests passed. But testResults.xml couldn't be found.

@StephenBonikowsky
Copy link
Member

Those are CI issues I'm working on, don't block your merge on it.

@StephenBonikowsky
Copy link
Member

LGTM, although I'd like to know more about the code we stripped out, I can follow-up offline.

@StephenBonikowsky
Copy link
Member

@dotnet-bot test ci please

@shmao
Copy link
Contributor Author

shmao commented Jun 28, 2017

@StephenBonikowsky The removed classes were added because they were not available on netcore50, so we make a internal copy of the framework type. As the types are available in NS2.0, we can remove them. Otherwise, the build would complain about ambiguous types.

</ItemGroup>

<PropertyGroup Condition="'$(TargetGroup)' != 'netcore50' AND '$(TargetsWindows)' == 'true'">
<PropertyGroup Condition="'$(TargetGroup)' != 'uap' AND '$(TargetsWindows)' == 'true'">
<DefineConstants>$(DefineConstants);SUPPORTS_WINDOWSIDENTITY</DefineConstants>
</PropertyGroup>
Copy link
Member

Choose a reason for hiding this comment

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

Can we please remove this section? #2006

@mconnew
Copy link
Member

mconnew commented Jun 29, 2017

@dotnet-bot test all outerloop please

@mconnew
Copy link
Member

mconnew commented Jun 29, 2017

@dotnet-bot test all innerloop please

Copy link
Member

@zhenlan zhenlan left a comment

Choose a reason for hiding this comment

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

Thanks @shmao!

@shmao shmao merged commit 4201301 into master Jun 29, 2017
@shmao shmao deleted the 2003-BlockedFromReflection branch June 29, 2017 16:55
shmao added a commit to shmao/wcf that referenced this pull request Jun 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants