[build] remove XAIntegrationDebug and XAIntegrationRelease #368
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In PR: dotnet#360 I will likely add a new `$(Configuration)` to be used in xamarin-android, so we can build `Java.Interop` as a non-PCL. The existence of `XAIntegrationDebug` and `XAIntegrationRelease` are confusing, since they are no longer used. See: dotnet@54a2aff dotnet/android#1231 This removes `XAIntegrationDebug` and `XAIntegrationRelease` from all solutions, project files, and `Makefile`. I also let VS 2017 update the SLN file, as it was an old VS 2010 format...
|
I'm having to backport this, to fix: dotnet/android#2157 And then the SLN file had a conflict, so opening this PR. The build failure in #2157 is mentioning |
radekdoulik
reviewed
Sep 10, 2018
| @@ -116,7 +94,7 @@ | |||
| <Compile Include="Java.Interop\JniAddNativeMethodRegistrationAttribute.cs" /> | |||
| <Compile Include="Java.Interop\JniNativeMethodRegistrationArguments.cs" /> | |||
| </ItemGroup> | |||
| <ItemGroup Condition=" !$(Configuration.StartsWith('XAIntegration')) "> | |||
| <ItemGroup> | |||
There was a problem hiding this comment.
I guess we can just merge these 2 item groups.
radekdoulik
reviewed
Sep 10, 2018
| @@ -12,7 +12,7 @@ NATIVE_EXT = .so | |||
| DLLMAP_OS_NAME = linux | |||
| endif | |||
|
|
|||
| XA_CONFIGURATION = XAIntegrationDebug | |||
| XA_CONFIGURATION = Debug | |||
There was a problem hiding this comment.
Do we need to keep this around?
I guess we should remove more stuff like xa-fxcop rule, xa-all rule, XA_INTEGRATION_OUTPUTS variable, ...
|
Mainly looking to backport this to get this one green: dotnet/android#2157 @jonpryor can I address @radekdoulik's review comments on master in another PR? |
|
@jonathanpeppers asked:
Yes, those can be in a separate PR. |
jonathanpeppers
added a commit
to jonathanpeppers/java.interop
that referenced
this pull request
Sep 11, 2018
Context: dotnet#368 Addressing the comments in dotnet#368, this removes more unused build targets, etc.
jonathanpeppers
added a commit
to jonathanpeppers/java.interop
that referenced
this pull request
Sep 11, 2018
Context: dotnet#368 Addressing the comments in dotnet#368, this removes more unused build targets, etc.
jonathanpeppers
added a commit
to jonathanpeppers/java.interop
that referenced
this pull request
Sep 11, 2018
Context: dotnet#368 Addressing the comments in dotnet#368, this removes more unused build targets, etc.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In PR: #360
I will likely add a new
$(Configuration)to be used inxamarin-android, so we can build
Java.Interopas a non-PCL.The existence of
XAIntegrationDebugandXAIntegrationReleaseareconfusing, since they are no longer used.
See:
54a2aff
dotnet/android#1231
This removes
XAIntegrationDebugandXAIntegrationReleasefrom allsolutions, project files, and
Makefile.I also let VS 2017 update the SLN file, as it was an old VS 2010
format...