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.

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

Jump to bottom

[tests] fixed search paths for MSBuild on Windows #869

Merged
merged 1 commit into from
Sep 18, 2017
Merged

[tests] fixed search paths for MSBuild on Windows #869

merged 1 commit into from
Sep 18, 2017

Conversation

jonathanpeppers
Copy link
Member

Builder.cs used in the unit tests does not currently use MSBuild from
Visual Studio 2017.

MSBuild is now located by checking the following:

  • Check XA_MSBUILD_EXE environment variable
  • Check VS 2017 path
  • Check older VS path
  • Check .NET path

Also updated FrameworkLibDirectory to check VS 2017 path.

@jonathanpeppers
[tests] fixed search paths for MSBuild on Windows
3a49fe4 
Builder.cs used in the unit tests does not currently use MSBuild from
Visual Studio 2017.

MSBuild is now located by checking the following:
- Check `XA_MSBUILD_EXE` environment variable
- Check VS 2017 path
- Check older VS path
- Check .NET path

Also updated `FrameworkLibDirectory` to check VS 2017 path.
@dnfclas
Copy link

dnfclas commented Sep 18, 2017

@jonathanpeppers,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by .NET Foundation. We will now review your pull request.
Thanks,
.NET Foundation Pull Request Bot

@dnfclas
Copy link

dnfclas commented Sep 18, 2017

@jonathanpeppers, thanks for signing the contribution license agreement. We will now validate the agreement and then the pull request.

Thanks, .NET Foundation Pull Request Bot

@jonpryor jonpryor merged commit 5266b4a into dotnet:master Sep 18, 2017
@jonathanpeppers jonathanpeppers deleted the windows-tests-vs2017 branch September 25, 2017 13:14
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Aug 24, 2021
@jonpryor
Bump to xamarin/Java.Interop/main@8898bc14
3a48cb1 
Changes: http://github.com/xamarin/Java.Interop/compare/ff2714200107fb616828b9d1013f69605791d2ba...8898bc1402953fdf3a1e1066dd2542fc1818aadf

  * dotnet/java-interop@8898bc14: [build] Import $(MSBuildProjectDirectory).override.props (dotnet#872)
  * dotnet/java-interop@d16b1e56: [build] Use GitInfo to generate $(Version) (dotnet#865)
  * dotnet/java-interop@2eb9ff26: [build] .NET 6 P7 Support (dotnet#869)

Set `$(XamarinAndroidToolsDirectory)` for `external/Java.Interop`
so that the Java.Interop build uses `external/xamarin-android-tools`.
@jonpryor jonpryor mentioned this pull request Aug 24, 2021
Merged
jonpryor pushed a commit that referenced this pull request Aug 25, 2021
@dotnet-maestro @jonathanpeppers @jonpryor
Bump to dotnet/installer@9c463710 6.0.100-rc.1.21369 (#6072)
c46e836 
Context: #6234
Context: 1e5bfa3
Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=5132407&view=logs&jobId=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=65256bb7-a34c-5353-bc4d-c02ee25dc133

Changes: dotnet/java-interop@48766c0...476bb5b

  * dotnet/java-interop@476bb5b7: [build] .NET 6 P7 Support (#869)
  * dotnet/java-interop@0028e32c: [build] set $(DisableImplicitNamespaceImports) by default (#859)

We don't actually *care* about dotnet/installer@9c463710 bump.
We care that the attempt to build PR #6234 fails to build:

	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CompatApi command: /Users/builder/.nuget/packages/microsoft.dotnet.apicompat/5.0.0-beta.20181.7/tools/net472/Microsoft.DotNet.ApiCompat.exe "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/reference/Mono.Android.dll" -i "/Users/builder/azdo/_work/2/s/xamarin-android/bin/Release/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/net6.0" --allow-default-interface-methods --baseline "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/acceptable-breakages-vReference.txt" --validate-baseline --exclude-attributes "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/api-compat-exclude-attributes.txt"
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CheckApiCompatibility found nonacceptable Api breakages for ApiLevel: v12.0.
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Compat issues with assembly Mono.Android:
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : TypesMustExist : Type 'Xamarin.Android.Net.AndroidMessageHandler' does not exist in the implementation but it does exist in the contract.
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Total Issues: 1

It fails to build because we `CheckApiCompatibility` expects the
`Xamarin.Android.Net.AndroidMessageHandler` type to exist, and it
doesn't exist, because it was added until… 1e5bfa3.
That's the primary thing we're after.  Everything else is fluff, and
the dotnet/runtime-related changes are not otherwise needed -- or
cared about -- on d16-11.

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Aug 25, 2021
@jonpryor
Bump to xamarin/Java.Interop/main@9a878f21
d9da10c 
Changes: http://github.com/xamarin/Java.Interop/compare/ff2714200107fb616828b9d1013f69605791d2ba...9a878f211c86bdd37cb71c5c461f85a0c1a1480d

  * dotnet/java-interop@9a878f21: [build] Properly implement "parent directory.override.props" (dotnet#300) (dotnet#873)
  * dotnet/java-interop@0c5d454c: [Java.Interop] fix .NET 6 linker warnings (dotnet#870)
  * dotnet/java-interop@8898bc14: [build] Import $(MSBuildProjectDirectory).override.props (dotnet#872)
  * dotnet/java-interop@d16b1e56: [build] Use GitInfo to generate $(Version) (dotnet#865)
  * dotnet/java-interop@2eb9ff26: [build] .NET 6 P7 Support (dotnet#869)

Set `$(XamarinAndroidToolsDirectory)` for `external/Java.Interop`
so that the Java.Interop build uses `external/xamarin-android-tools`.
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Aug 26, 2021
@jonpryor
Bump to xamarin/Java.Interop/main@b7982e42
b5066be 
Changes: http://github.com/xamarin/Java.Interop/compare/ff2714200107fb616828b9d1013f69605791d2ba...b7982e423952a4c4afe0c33f36ac80eed7fa57a2

  * dotnet/java-interop@b7982e42: Revert "[build] Use GitInfo to generate $(Version) (dotnet#865)" (dotnet#874)
  * dotnet/java-interop@9a878f21: [build] Properly implement "parent directory.override.props" (dotnet#300) (dotnet#873)
  * dotnet/java-interop@0c5d454c: [Java.Interop] fix .NET 6 linker warnings (dotnet#870)
  * dotnet/java-interop@8898bc14: [build] Import $(MSBuildProjectDirectory).override.props (dotnet#872)
  * dotnet/java-interop@d16b1e56: [build] Use GitInfo to generate $(Version) (dotnet#865)
  * dotnet/java-interop@2eb9ff26: [build] .NET 6 P7 Support (dotnet#869)

Set `$(XamarinAndroidToolsDirectory)` for `external/Java.Interop`
so that the Java.Interop build uses `external/xamarin-android-tools`.
jonpryor pushed a commit that referenced this pull request Aug 26, 2021
@dotnet-maestro @jonathanpeppers @jonpryor
Bump to dotnet/installer@9c463710 6.0.100-rc.1.21369 (#6072)
397f4de 
Context: #6234
Context: 1e5bfa3
Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=5132407&view=logs&jobId=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=65256bb7-a34c-5353-bc4d-c02ee25dc133

Changes: dotnet/java-interop@48766c0...476bb5b

  * dotnet/java-interop@476bb5b7: [build] .NET 6 P7 Support (#869)
  * dotnet/java-interop@0028e32c: [build] set $(DisableImplicitNamespaceImports) by default (#859)

We don't actually *care* about dotnet/installer@9c463710 bump.
We care that the attempt to build PR #6234 fails to build:

	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CompatApi command: /Users/builder/.nuget/packages/microsoft.dotnet.apicompat/5.0.0-beta.20181.7/tools/net472/Microsoft.DotNet.ApiCompat.exe "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/reference/Mono.Android.dll" -i "/Users/builder/azdo/_work/2/s/xamarin-android/bin/Release/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/net6.0" --allow-default-interface-methods --baseline "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/acceptable-breakages-vReference.txt" --validate-baseline --exclude-attributes "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/api-compat-exclude-attributes.txt"
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CheckApiCompatibility found nonacceptable Api breakages for ApiLevel: v12.0.
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Compat issues with assembly Mono.Android:
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : TypesMustExist : Type 'Xamarin.Android.Net.AndroidMessageHandler' does not exist in the implementation but it does exist in the contract.
	…/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Total Issues: 1

It fails to build because we `CheckApiCompatibility` expects the
`Xamarin.Android.Net.AndroidMessageHandler` type to exist, and it
doesn't exist, because it was added until… 1e5bfa3.
That's the primary thing we're after.  Everything else is fluff, and
the dotnet/runtime-related changes are not otherwise needed -- or
cared about -- on d16-11.

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
jonpryor added a commit that referenced this pull request Aug 26, 2021
@jonpryor
Bump to xamarin/Java.Interop/main@b7982e42 (#6229)
21bfc47 
Changes: http://github.com/xamarin/Java.Interop/compare/ff2714200107fb616828b9d1013f69605791d2ba...b7982e423952a4c4afe0c33f36ac80eed7fa57a2

  * dotnet/java-interop@b7982e42: Revert "[build] Use GitInfo to generate $(Version) (#865)" (#874)
  * dotnet/java-interop@9a878f21: [build] Properly implement "parent directory.override.props" (#300) (#873)
  * dotnet/java-interop@0c5d454c: [Java.Interop] fix .NET 6 linker warnings (#870)
  * dotnet/java-interop@8898bc14: [build] Import $(MSBuildProjectDirectory).override.props (#872)
  * dotnet/java-interop@d16b1e56: [build] Use GitInfo to generate $(Version) (#865)
  * dotnet/java-interop@2eb9ff26: [build] .NET 6 P7 Support (#869)

Set `$(XamarinAndroidToolsDirectory)` for `external/Java.Interop`
so that the Java.Interop build uses `external/xamarin-android-tools`.
@github-actions github-actions bot locked and limited conversation to collaborators Feb 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dellis1972 dellis1972 dellis1972 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jonathanpeppers @dnfclas @dellis1972 @jonpryor