Граф коммитов

24 Коммитов

Автор SHA1 Сообщение Дата
Michael Cummings (MSFT) 6aca25ad5d
Add Xcsync tool to workload package (#20931)
Co-authored-by: Haritha Mohan <harithamohan@microsoft.com>
Co-authored-by: Alex Soto <alex@soto.dev>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2024-08-05 12:40:36 -04:00
Rolf Bjarne Kvinge 45225dc88d
[dotnet] Parameterize the pack names. (#18732)
We're going to change the pack names to support multi-targeting, so ahead
of the pack name change I'm changing the existing logic to use a variable
for the pack name in most places (this will make the rename much easier and
simpler).

These changes should have no effect by themselves.
2023-08-29 10:06:46 +02:00
Rolf Bjarne Kvinge 0ad313fc1c
Use the current version of .NET in a few projects. (#18206) 2023-05-03 22:46:58 +02:00
Chris Hamons bfa035c615
[mlaunch] Fix permisisons after extracting from nuget (#15566)
* [mlaunch] Fix permisisons after extracting from nuget

- A side effect of ac1fa25816 is that the permission of bin/mlaunch is no longer +x for non-root, which means it is unusable.

* Apply suggestions from code review

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>

* Apply fix to app bundle mlaunch as well

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-07-25 18:08:42 -04:00
Rolf Bjarne Kvinge ac1fa25816
[mlaunch] Download mlaunch from NuGet instead of building from maccore. (#15298)
Download mlaunch from NuGet instead of building from maccore, and copy the
downloaded files into the packages we ship (both legacy Xamarin's pkg and .NET
nupkgs).

Eventually we'll want to reference the mlaunch NuGet from the .NET nupkgs, but
that's a later step.
2022-07-13 11:00:15 +02:00
Přemek Vysoký 0a99bc260d
[Xharness] Extract mlaunch nupkg only once when multi-targeting (#14631) 2022-04-04 17:41:03 -04:00
Manuel de la Pena 57448bff48
[Makefile] Remove warning in submake commands. (#12840)
Remove the following warning:

```
make[3]: warning: -jN forced in submake: disabling jobserver mode.
/Applications/Xcode_13.0.0-beta5.app/Contents/Developer/usr/bin/make -C ../../../maccore/tools/mlaunch install -j8
make[3]: warning: -jN forced in submake: disabling jobserver mode.
/Applications/Xcode_13.0.0-beta5.app/Contents/Developer/usr/bin/make
../../_build/Microsoft.iOS.Sdk/tools/bin/mlaunch
../../_build/Microsoft.tvOS.Sdk/tools/bin/mlaunch
```

There is no need to pass the number of jobs to be used to a submake
commands as per the gnu make documentation:
```
The ‘-j’ option is a special case (see Parallel Execution). If you set it to some numeric value ‘N’ and your operating system supports it (most any UNIX system will; others typically won’t), the parent make and all the sub-makes will communicate to ensure that there are only ‘N’ jobs running at the same time between them all. Note that any job that is marked recursive (see Instead of Executing Recipes) doesn’t count against the total jobs (otherwise we could get ‘N’ sub-makes running and have no slots left over for any real work!)
```

That means there is not need to pass it since it will be the default
used in submake commands. The override has not effect other the warning
and therefore is better to remove the noise.
2021-09-27 06:55:23 -04:00
Rolf Bjarne Kvinge 2972e1b715
Fix some whitespace issues in various files. (#12399)
* Remove BOM
* Add EOL at end of file.
2021-08-11 10:06:46 +02:00
Přemek Vysoký 0a65331ca7
[devops] Publish mlaunch as .nupkg during main build (#11851)
Packages the mlaunch that was built during the pipeline previously as a .nupkg and publishes it into the [dotnet-eng feed](https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet-eng):
- Version contains the maccore commit SHA
- If this SHA is already published in the feed, packaging and publishing is skipped

Target package: https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=Microsoft.DotNet.Mlaunch&protocolType=NuGet (will show up after main build completes)

https://github.com/dotnet/core-eng/issues/13150
2021-06-10 18:29:59 +02:00
Rolf Bjarne Kvinge 7705a87833
[mlaunch] Fix conditional makefile logic. (#11668)
This makes us ship mlaunch in .NET again.
2021-05-25 21:31:47 +02:00
Rolf Bjarne Kvinge 14f7cf48a0
[mlaunch] Don't ship for MacCatalyst. (#11397)
We don't need mlaunch for MacCatalyst.
2021-05-04 08:26:01 +02:00
Rolf Bjarne Kvinge 4b8c328a48
[mlaunch] Only build if both iOS and macOS are enabled. (#11384) 2021-04-30 07:50:14 +02:00
Rolf Bjarne Kvinge 80ed9d81bc
Add configure option to disable building for legacy Xamarin. (#10773)
* Add configure option to disable building for legacy Xamarin.

This can greatly speed up the debug-edit-build cycle when doing .NET
development, since it cuts down the build time in half more or less.

* Bump maccore.

New commits in xamarin/maccore:

* xamarin/maccore@548fa45432 [mlaunch] Disable building mlaunch when not including the legacy Xamarin build. (#2403)

Diff: 0562e08b12..548fa45432
2021-03-04 09:07:44 +01:00
Rolf Bjarne Kvinge c0ecd33bf9
[mlaunch] Improve make logic to only install bin/mlaunch if it changed. (#10461)
This way the bin directory doesn't unnecessarily get an updated timestamp, so
that some build targets in the dotnet/ directory don't rebuild unnecessarily.
2021-01-20 08:16:28 +01:00
Rolf Bjarne Kvinge 3174e94a17
[mlaunch] Adjust build logic to ship mlaunch with the .NET nugets when we're building mlaunch as well. (#10122)
The original implementation only worked when we used mlaunch from the
macios-binaries repository.
2020-11-20 14:41:03 +01:00
Rolf Bjarne Kvinge 3d906e7000
[dotnet] Add support for 'dotnet build -t:run'. (#9823)
* Ship mlaunch in the iOS, tvOS and watchOS NuGets. It should probably go into
  a separate NuGet (to avoid shipping the same mlaunch executable in three different
  packages), but that can be done at a later stage.

* Add a GetMlaunchArguments task that computes the mlaunch arguments to install
  or launch an app in either the simulator or on device.

* Implement the MSBuild logic to make the Run target (provided by .NET) launch
  mlaunch (for iOS, tvOS and watchOS) or the built app (for macOS). This is done
  by setting the RunCommand and RunArguments properties (which the Run target uses)
  to the correct values.

Ideally I'd would make 'dotnet run' work too, but that runs into a different problem which
I haven't figured out yet:

    A fatal error was encountered. The library 'libhostpolicy.dylib' required to execute the application was not found in '/Users/rolf/work/maccore/onedotnet/xamarin-macios/tests/dotnet/MySingleView/bin/Debug/net5.0-ios/ios-x64/'.
    Failed to run as a self-contained app.
      - The application was run as a self-contained app because '/Users/rolf/work/maccore/onedotnet/xamarin-macios/tests/dotnet/MySingleView/bin/Debug/net5.0-ios/ios-x64/MySingleView.runtimeconfig.json' did not specify a framework.
      - If this should be a framework-dependent app, specify the appropriate framework in '/Users/rolf/work/maccore/onedotnet/xamarin-macios/tests/dotnet/MySingleView/bin/Debug/net5.0-ios/ios-x64/MySingleView.runtimeconfig.json'.

That's for a different pull request though.

Ref: https://github.com/xamarin/net6-samples/issues/35.
2020-10-09 13:01:13 +02:00
Manuel de la Pena eb9b690fe0 Merge xcode12 into d16-8. 2020-09-18 17:51:52 -04:00
Alex Soto bfc98f8059
[xcode12] Initial bump for Xcode 12 GM (#9644)
* [xcode12] Initial bump for Xcode 12 GM

* [tests][intro] We cannot load CoreNFC framework on iOS simulator anymore

* [tests][xtro] New Metal API are not abstract (before XAMCORE_4_0)

* [tests][intro] Fix crash when CSLocalizedString 'description' selector is called

* [tests][xtro] Add support for excluding platforms

Based on `Make.config` variables `INCLUDE_[IOS|TVOS|WATCH|MAC]`

This required moving some entries (common -> macOS) to keep the
sanitizer happy.

* [xtro] Ignore Intents watchOS differences since they will likely match iOS in the future

* Update to use Xcode 12 GMb instead of the old GM

* [tests][xtro] Remove OSLog for iOS and tvOS (changed in GM)

* [tests][msbuild] Disable FrameworkListTest based on the active/disabled platforms

* [tests][msbuild] Track new directory/file inside CoreML projects

* [mlaunch] Bump maccore and disable mlaunch if mac build is disabled

New commits in xamarin/maccore:

* xamarin/maccore@ba332d4d07 Disable mlaunch if Mac is not built (#2314)

Diff: 87a96d21c9..ba332d4d07

Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
2020-09-16 11:41:44 +02:00
Rolf Bjarne Kvinge 8866707bdb
[mlaunch] Add a commit message with a pointer to the maccore hash that GitHub renders as a link. (#8956)
Add a commit message with a pointer to the maccore hash that GitHub renders as
a link when publishing an mlaunch binary to the macios-binaries repository.

This will hopefully make it _slightly_ easier to review since verifying the
maccore hash is now just a click away.
2020-06-26 10:55:51 +02:00
Rolf Bjarne Kvinge 19cb5ad76d
[mlaunch] Fix clean target to actually do something. (#5985) 2019-05-03 19:11:22 +02:00
Rolf Bjarne Kvinge c69c74b3d3
Clone files if possible whenever it makes sense. (#5049)
Cloning is faster when supported, and it also saves disk space.
2018-10-29 16:09:30 +01:00
Rolf Bjarne Kvinge 34af7112b5
Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316. (#3877)
* Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316.

If the Xamarin build is enabled, then build mlaunch from source, otherwise get it from macios-binaries.

Fixes #3316.

* Bump macios-binaries.

Commit list for xamarin/macios-binaries:

* xamarin/macios-binaries@69a9088 Bump mlaunch to xamarin/maccore@4505cd6f02 (#8)

Diff: e1e8bdf7a8...69a90882a0

* make msbuild/ after tools/.

Build msbuild/ after tools/, so that mlaunch builds when building from source,
since its build needs the MSBuild logic installed by msbuild/.

* Bump macios-binaries to get Xcode 9.3-capable mlaunch.
2018-04-10 09:53:11 +02:00
Rolf Bjarne Kvinge 4a0fd52fff Revert "Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316. (#3800)" (#3805)
This reverts commit e6c45c2489.

It breaks the mlaunch build.
2018-03-22 21:27:19 -04:00
Rolf Bjarne Kvinge e6c45c2489
Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316. (#3800)
* Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316.

If the Xamarin build is enabled, then build mlaunch from source, otherwise get it from macios-binaries.

Fixes #3316.

* Bump macios-binaries.

Commit list for xamarin/macios-binaries:

* xamarin/macios-binaries@69a9088 Bump mlaunch to xamarin/maccore@4505cd6f02 (#8)

Diff: e1e8bdf7a8...69a90882a0
2018-03-22 18:26:07 +01:00