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

33 Коммитов

Автор SHA1 Сообщение Дата
dotnet-maestro[bot] 33172248c6
[main] Update dependencies from dotnet/runtime (#15586)
* Update dependencies from https://github.com/dotnet/runtime build 20220727.6

Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.8

* Update dependencies from https://github.com/dotnet/runtime build 20220727.6

Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.8

* Update dependencies from https://github.com/dotnet/runtime build 20220813.7

Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.9

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.4 -> To Version 6.0.8 (parent: Microsoft.NETCore.App.Ref

* Update dependencies from https://github.com/dotnet/runtime build 20220815.11

Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.9

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.4 -> To Version 6.0.9 (parent: Microsoft.NETCore.App.Ref

* Update dependencies from https://github.com/dotnet/runtime build 20220816.8

Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.9

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.4 -> To Version 6.0.9 (parent: Microsoft.NETCore.App.Ref

* Update dependencies from https://github.com/dotnet/runtime build 20220819.3

Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.9

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.4 -> To Version 6.0.9 (parent: Microsoft.NETCore.App.Ref

* [tests] Adjust InvalidRuntimeIdentifier_Restore to expect failure for Mac Catalyst.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-08-23 15:03:30 +02:00
dotnet-maestro[bot] 4221018aba
[main] Update dependencies from dotnet/runtime (#15495)
Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-15 20:35:16 +02:00
dotnet-maestro[bot] 156777dbb4
[main] Update dependencies from dotnet/runtime (#15484)
Microsoft.NETCore.App.Ref
 From Version 6.0.8 -> To Version 6.0.8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-14 10:33:29 +02:00
dotnet-maestro[bot] 54192846aa
[main] Update dependencies from dotnet/runtime (#15425)
Microsoft.NETCore.App.Ref
 From Version 6.0.6 -> To Version 6.0.8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-07-12 19:10:09 +02:00
Rolf Bjarne Kvinge a1d0b6eba9
Make our local .NET the default .NET for the build. (#15086)
Make our local .NET the default .NET (in the root's global.json), and then if
a directory wants to use the system .NET, then that directory would have to
opt-in (using its own global.json).

This way we don't have to copy global.json/NuGet.config files around to run
tests with the correct .NET setup.
2022-06-07 10:11:02 +02:00
dotnet-maestro[bot] bcd03374a9
[main] Update dependencies from dotnet/runtime (#15047)
This pull request updates the following dependencies

[marker]: <> (Begin:0f76eea3-d4b0-4229-e732-08d9ecb01c9c)
## From https://github.com/dotnet/runtime
- **Subscription**: 0f76eea3-d4b0-4229-e732-08d9ecb01c9c
- **Build**: 20220516.4
- **Date Produced**: May 16, 2022 8:48:30 PM UTC
- **Commit**: 15626cf7e26af1c3800127242e47237698faed61
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][1]

[1]: 21d3425...15626cf

[DependencyUpdate]: <> (End)


[marker]: <> (End:0f76eea3-d4b0-4229-e732-08d9ecb01c9c)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-18 13:00:10 +02:00
dotnet-maestro[bot] 9a46a8b46d
[main] Update dependencies from dotnet/runtime (#14983)
* Update dependencies from https://github.com/dotnet/runtime build 20220510.4

Microsoft.NETCore.App.Ref
 From Version 6.0.6 -> To Version 6.0.6

* Update dependencies from https://github.com/dotnet/runtime build 20220513.1

Microsoft.NETCore.App.Ref
 From Version 6.0.6 -> To Version 6.0.6

* Update dependencies from https://github.com/dotnet/runtime build 20220513.11

Microsoft.NETCore.App.Ref
 From Version 6.0.6 -> To Version 6.0.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-05-16 11:29:51 +02:00
dotnet-maestro[bot] fb57211f6f
[main] Update dependencies from dotnet/installer (#15033)
Update dependencies from https://github.com/dotnet/installer build 20220513.15

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.301-rtm.22261.3 -> To Version 6.0.301-rtm.22263.15

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-16 11:28:24 +02:00
dotnet-maestro[bot] 4800775b4d
[main] Update dependencies from dotnet/installer (#14966)
* Update dependencies from https://github.com/dotnet/installer build 20220510.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.301-rtm.22254.17 -> To Version 6.0.301-rtm.22260.1

* Update dependencies from https://github.com/dotnet/installer build 20220510.12

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.301-rtm.22254.17 -> To Version 6.0.301-rtm.22260.12

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.AspNetCore.App.Ref
 From Version 6.0.200-1.22178.2 -> To Version 6.0.200-1.22219.3 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/dotnet/installer build 20220511.3

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.301-rtm.22254.17 -> To Version 6.0.301-rtm.22261.3

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.AspNetCore.App.Ref
 From Version 6.0.200-1.22178.2 -> To Version 6.0.200-1.22219.3 (parent: Microsoft.Dotnet.Sdk.Internal

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-05-13 09:29:18 +02:00
dotnet-maestro[bot] 073c2c1047
[main] Update dependencies from dotnet/runtime (#14921)
Microsoft.NETCore.App.Ref
 From Version 6.0.6 -> To Version 6.0.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-09 10:59:51 +02:00
dotnet-maestro[bot] b407a0b0f9
[main] Update dependencies from dotnet/runtime (#14890)
* Update dependencies from https://github.com/dotnet/runtime build 20220503.10

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.6

* Update dependencies from https://github.com/dotnet/runtime build 20220504.4

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-06 09:18:15 +02:00
dotnet-maestro[bot] fd3112e7f7
[main] Update dependencies from dotnet/runtime (#14692)
* Update dependencies from https://github.com/dotnet/runtime build 20220406.5

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.5

* Update dependencies from https://github.com/dotnet/runtime build 20220411.4

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.5

* Update dependencies from https://github.com/dotnet/runtime build 20220412.7

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.5

* Update dependencies from https://github.com/dotnet/runtime build 20220413.11

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.5

* Update dependencies from https://github.com/dotnet/runtime build 20220413.11

Microsoft.NETCore.App.Ref
 From Version 6.0.5 -> To Version 6.0.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-04-20 10:32:17 +02:00
dotnet-maestro[bot] 56e0ffecdd
[main] Update dependencies from dotnet/runtime (#14674)
Microsoft.NETCore.App.Ref
 From Version 6.0.4 -> To Version 6.0.5

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.4 -> To Version 6.0.4 (parent: Microsoft.NETCore.App.Ref

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-07 09:30:19 +02:00
dotnet-maestro[bot] 9e9f28a111
[main] Update dependencies from dotnet/runtime (#14315)
* Update dependencies from https://github.com/dotnet/runtime build 20220303.4

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4

* Update dependencies from https://github.com/dotnet/runtime build 20220308.10

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4

* Update dependencies from https://github.com/dotnet/runtime build 20220309.5

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4

* Add feed for the System.Runtime.InteropServices.NFlaot.Internal package.

* Revert "Add feed for the System.Runtime.InteropServices.NFlaot.Internal package."

This reverts commit a394c48482.

* Update dependencies from https://github.com/dotnet/runtime build 20220310.4

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4

* Update dependencies from https://github.com/dotnet/runtime build 20220310.4

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4

* Update dependencies from https://github.com/dotnet/runtime build 20220311.8

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.2 -> To Version 6.0.4 (parent: Microsoft.NETCore.App.Ref

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-03-23 16:31:28 +01:00
dotnet-maestro[bot] 45b8df6860
[main] Update dependencies from dotnet/installer (#14395)
* Update dependencies from https://github.com/dotnet/installer build 20220311.20

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22154.4 -> To Version 6.0.300-preview.22161.20

* Update dependencies from https://github.com/dotnet/installer build 20220314.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22154.4 -> To Version 6.0.300-preview.22164.2

* Update dependencies from https://github.com/dotnet/installer build 20220315.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22154.4 -> To Version 6.0.300-preview.22165.2

* Update dependencies from https://github.com/dotnet/installer build 20220316.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22154.4 -> To Version 6.0.300-preview.22166.1

* Update dependencies from https://github.com/dotnet/installer build 20220316.14

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22154.4 -> To Version 6.0.300-preview.22166.14

* Update dependencies from https://github.com/dotnet/installer build 20220318.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22154.4 -> To Version 6.0.300-preview.22168.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-03-22 08:14:47 +01:00
Bekir Ozturk af30c26381
[Localization] Turn on template localization on dotnet CLI (#14213) 2022-03-11 10:30:47 -05:00
dotnet-maestro[bot] 17dae1537c
Update dependencies from https://github.com/dotnet/installer build 20220301.9 (#14289)
Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22128.2 -> To Version 6.0.300-preview.22151.9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-03-03 23:41:08 +01:00
dotnet-maestro[bot] 4bda73fc82
Update dependencies from https://github.com/dotnet/runtime build 20220223.8 (#14241)
Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-02-28 11:24:13 +01:00
dotnet-maestro[bot] 1273190e5f
[main] Update dependencies from dotnet/installer (#14156)
* Update dependencies from https://github.com/dotnet/installer build 20220211.11

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.201-servicing.22111.7 -> To Version 6.0.300-preview.22111.11

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.22069.1 -> To Version 6.0.100-1.21519.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/dotnet/installer build 20220216.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.201-servicing.22111.7 -> To Version 6.0.300-preview.22116.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.22069.1 -> To Version 6.0.100-1.21519.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Use the preview csc.

* Hardcode the toolchain version band to 6.0.200 for now.

* Bump dotnet/runtime to get nfloat changes.

* Add a dependency on Microsoft.NET.Workload.Emscripten.Manifest-6.0.100, and use it.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-02-17 15:29:41 +01:00
Rolf Bjarne Kvinge e25163f573
[.NET] Rename our product assemblies. Fixes #13748. (#13847)
Rename our product assemblies to:

* Microsoft.iOS.dll
* Microsoft.tvOS.dll
* Microsoft.macOS.dll
* Microsoft.MacCatalyst.dll

This makes it easy to distinguish between legacy Xamarin and .NET whenever the
product assembly is mentioned, and I've also chosen the platform part of the
name to match how the platforms are named elsewhere (this also makes it
possible to simplify our build logic, since we can remove a lot of special
casing).

Fixes https://github.com/xamarin/xamarin-macios/issues/13748.
2022-02-16 21:30:32 +01:00
dotnet-maestro[bot] b2d97ffd3f
[main] Update dependencies from dotnet/installer (#13353)
* Update dependencies from https://github.com/dotnet/installer build 20211111.4

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21552.8 -> To Version 6.0.101-servicing.21561.4

* Update dependencies from https://github.com/dotnet/installer build 20211112.12

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21552.8 -> To Version 6.0.101-servicing.21562.12

* [dotnet] Use X.Y.Z00 as the version band for the sdk-manifests path.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2021-11-15 22:54:55 +01:00
dotnet-maestro[bot] 48ef9469af
[main] Update dependencies from dotnet/installer (#13093)
* Update dependencies from https://github.com/dotnet/installer build 20211022.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21522.1

* Update dependencies from https://github.com/dotnet/installer build 20211022.16

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21522.16

* Update dependencies from https://github.com/dotnet/installer build 20211023.8

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21523.8

* Update dependencies from https://github.com/dotnet/installer build 20211024.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21524.1

* Add a dependency to Microsoft.NETCore.App.Ref.

That way we match what XA did here: 16c1226dde

It also makes Maestro update our NuGet.config for us, which additional feeds we seem
to need to build.

* [dotnet] Use all the sources in the NuGet.config when installing workloads.

* Update dependencies from https://github.com/dotnet/installer build 20211025.3

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21525.3

* Add dependency on Microsoft.AspNetCore.App.Ref.

* Update dependencies from https://github.com/dotnet/installer build 20211026.10

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21526.10

* [tests] Disable the implicit FSharp.Core reference.

Fixes this:

    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103: Unable to find a stable package FSharp.Core with version (>= 6.0.1)
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 792 version(s) in dotnet-tools [ Nearest version: 6.0.2-beta.21519.1 ]
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 46 version(s) in dotnet-public [ Nearest version: 6.0.0 ]
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in xamarin-impl
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in darc-pub-dotnet-aspnetcore-ae1a6cb-1
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in darc-pub-dotnet-aspnetcore-ae1a6cb
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in darc-pub-dotnet-runtime-4822e3c-1
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in darc-pub-dotnet-runtime-4822e3c-2
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in darc-pub-dotnet-runtime-4822e3c-4
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in darc-pub-dotnet-runtime-4822e3c-5
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in Dotnet arcade
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in dotnet6
    xamarin-macios/tests/fsharp/dotnet/macOS/fsharp.fsproj : error NU1103:   - Found 0 version(s) in macios-dependencies

* [tests] Use a specific FSharp.Core version.

* Update dependencies from https://github.com/dotnet/installer build 20211027.11

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rtm.21521.3 -> To Version 6.0.100-rtm.21527.11

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2021-10-29 18:46:00 +02:00
dotnet-maestro[bot] e55a58c377
[main] Update dependencies from dotnet/installer (#12688)
* Update dependencies from https://github.com/dotnet/installer build 20210910.3

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21458.9 -> To Version 6.0.100-rc.2.21460.3

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.6.21452.4 -> To Version 6.0.100-1.21459.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/dotnet/installer build 20210910.37

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21458.9 -> To Version 6.0.100-rc.2.21460.37

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.6.21452.4 -> To Version 6.0.100-1.21459.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Add dotnet-tools to our NuGet feeds to work around an msbuild/nuget bug.

Ref: https://github.com/dotnet/msbuild/issues/6834

* [src] Add an additional HttpClientHandler property to NSUrlSessionHandler.

We need this otherwise we get linker warnings which results in test failures
(because we verify that building a template doesn't show any warnings):

    * Xamarin.Tests.TemplateTest.CreateAndBuildTemplate("iOS","ios"): Build warnings:
        System.Net.Http.HttpClientHandler.GetServerCertificateCustomValidationCallback(): No members were resolved for 'get_ServerCertificateCustomValidationCallback'.
        System.Net.Http.HttpClientHandler.SetServerCertificateCustomValidationCallback(Func<HttpRequestMessage,X509Certificate2,X509Chain,SslPolicyErrors,Boolean>): No members were resolved for 'set_ServerCertificateCustomValidationCallback'.

Ref: fc631442f9
Ref: 679cd97153

* Update dependencies from https://github.com/dotnet/installer build 20210913.12

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21458.9 -> To Version 6.0.100-rc.2.21463.12

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.6.21452.4 -> To Version 6.0.100-1.21459.1 (parent: Microsoft.Dotnet.Sdk.Internal

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2021-09-15 09:35:00 +02:00
Rolf Bjarne Kvinge bc673f1140
We need the xamarin-impl feed. (#12496)
Otherwise this happens:

    Errors in [...]/xamarin-macios/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj
        NU1101: Unable to find package Xamarin.Messaging.Build.Client. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies

    Errors in [...]/xamarin-macios/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
        NU1101: Unable to find package Xamarin.Messaging.Build.Client. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies

    Errors in [...]/xamarin-macios/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
        NU1101: Unable to find package Xamarin.Messaging.Build.Client. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies

    Errors in [...]/xamarin-macios/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Tasks.Windows.csproj
        NU1101: Unable to find package Xamarin.Messaging.Build.Client. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies
        NU1101: Unable to find package Xamarin.Messaging.Core. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies
        NU1101: Unable to find package Xamarin.iOS.HotRestart.Client. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies
        NU1101: Unable to find package Xamarin.Messaging.Server. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies

    Errors in [...]/xamarin-macios/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj
        NU1101: Unable to find package Xamarin.Messaging.Core. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies

    Errors in [...]/xamarin-macios/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj
        NU1101: Unable to find package Xamarin.Messaging.Build.Client. No packages exist with this id in source(s): Dotnet arcade, dotnet-public, dotnet6, macios-dependencies
2021-08-23 09:45:53 +02:00
Peter Collins c272040bdb
[ci] Push .NET 6 packages to dnceng dotnet6 feed (#12492)
We should now have the ability to push to the `dotnet6` feed that
contains the rest of the .NET 6 SDK Workload packages.  This should help
simplify workload acquisition.  The .nupkg files containing .msi the
.msi installers used for VS insertions will also now be pushed to this
feed.
2021-08-20 11:33:47 +02:00
Rolf Bjarne Kvinge d15f683500
[tests] Add a performance test using BenchmarkDotNet. (#11298) 2021-04-23 13:29:06 +02:00
Peter Collins 5c12fdfac9
[build] Use arcade dependency management tooling (#10890)
* [build] Use arcade dependency management tooling

* Apply feedback

* Apply second round of feedback

* Always make dotnet.config before trying to read it

* Debugging

* Update dependencies, trim tabs and spaces

* [dotnet] Remove the existing workload shipped with .NET and install our locally built ones.

The new version of .NET ships with our workloads, but those aren't
the workloads we want to use, so replace them with our own.

* Update .gitignores.

* Bump to 6.0.100-preview.3.21181.5

That required renaming simulator runtime packs...

* More rename for simulator packages

* moar (hopefully all)

* Bump to 6.0.100-preview.3.21201.11

This fix the issue with `Wait` that failed several tests in monotouch-tests

However it does not include the fix for AppConext.GetData on device (AOT)

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: Sebastien Pouliot <sebastien@xamarin.com>
2021-04-02 00:02:27 -04:00
Emanuel Fernandez Dell'Oca d337f0deac
[dotnet] Initial support for .NET6 from Windows (#10590)
These changes add support for executing iOS and MacDev tasks remotely (on a Mac) when running a build from Windows, and creates a specific .NET6 pack for Windows that's only included in the MSI.

For now this only enables builds for the iOS Simulator, physical devices are not yet supported.

- Each task decides if it should run locally or remotely depending on the SessionId property, which will only have a value on Windows.
- The XMA Build agent is now part of this repo and will be included in the iOS .NET6 Windows pack.
- On this first version we're including some Windows specific tasks and references into the Xamarin.iOS.Tasks project for simplicity, but those will be moved to the Windows specific project.

------------

* [msbuild] Adds support for executing Xamarin.iOS tasks from Windows

* [msbuild] Adds support for executing Xamarin.MacDev tasks from Windows

* Added XMA Build Agent to Xamarin.MacDev.Tasks.sln

* Fixes some MSBuild versioning problems

* Makes the XMA Build agent load Xamarin.iOS tasks

We need to load a type from the iOS tasks assembly so we can run the tasks requested by MSBuild from Windows. We only need to load Xamarin.iOS.Tasks.dll since MacDev.tasks is already embedded in that one.

There's a little trick on the csproj, we can't directly use the Xamarin.iOS.Tasks project ref assemblies because that includes both Xamarin.iOS.Tasks.dll and Xamarin.MacDev.Tasks.dll, so the MacDev tasks will collide. We use the project ref only for build dependency purposes but we add an assembly reference to Xamarin.iOS.Tasks.dll.

* Added Xamarin.iOS.Tasks.Windows project

* Removed unnecessary references on Xamarin.iOS.Tasks.Windows.csproj

* Adds Messaging assemblies when ILRepacking Xamarin Tasks

The Xamarin Task assemblies now depend on Messaging, so we need the Messaging assemblies to be packed into Xamarin.Mac.Tasks and Xamarin.iOS.Tasks. Also had to remove the direct Messaging dependencies from the build agent since those are already contained in Xamarin.iOS.Tasks

* Adds a reference to Messaging.Core targets to the Agent's project

* [msbuild] Adds Xamarin iOS Windows targets

* [msbuild] Adds missing dependencies to Xamarin.iOS.Tasks

This should fix build errors because of missing dependencies. Had to move System.Net.Mqtt.Server from the Build agent project to the tasks one to avoid conflicts with System.Diagnostics.Tracer.

* [dotnet] Creates iOS Windows pack

Creates a new pack for Windows specific (targets, build agent, etc.) files that shouldn't be installed on the Mac. We have a separate package for this to avoid increasing the core pack size with things that are not needed when using it from macOS.

* Fixes type in dotnet makefile

* [dotnet] Fixes the iOS Windows pack generation

- The windows pack should not include the Sdk and Targets folders
- For now we'll just create an iOS pack
- Fixes the path to the files to include on the Windows Sdk pack

* Added reference to the Windows iOS SDK from the Xamarin.iOS.Common.targets

Added a property to navigate to the Windows iOS SDK folder, based on a naming convention that assumes that both packs will always have the same version

* Added reference to the core iOS SDK from the Windows iOS SDK

Added a property to navigate to the core iOS SDK folder, based on a naming convention that assumes that both packs will always have the same version

* Updated Messaging version

* Override MessagingBuildClientAssemblyFile property and correctly imported props from targets

* [dotnet] Make Windows pack using target files from the output dir

We need to take the target files from the output dir to include targets that are part of nuget packages, otherwise we will only include targets from our source

* [dotnet] Adds the Windows Sdk pack to the workload manifest

* [msbuild] Fixes the Windows Sdk pack name

* [dotnet] Merge Mqtt instead of Mqtt.Server

We only need System.Net.Mqtt to be merged into Xamarin.iOS.Tasks

* Updated Messaging version

* [dotnet] Several fixes for the Windows Sdk

- Adds missing task CollectMonotouchReferences
- Merges more dependencies into Xamarin.iOS.Tasks.dll needed by XMA
- Updates the msbuild/Makefile to include files from both the output dir and the source dir
- Overrides the agents directory to look for them on the Windows pack

* [dotnet] Fixes the XMA Build agent

- The build agent is an app so it cannot target ns2.0
- The MSBuild dependencies should be copied into the agent zip file
- Avoids copying all the Xamarin iOS SDK core targets into the build agent, since those are not needed
- Ensures the broker zip file is copied into the Xamarin.iOS.Windows.Tasks output dir so its included in the Windows pack

* Bumps Xamarin.Messaging to 1.2.102

* Adds net6-win branch to trigger builds

* Adds Messaging.Client missing dependency to Xamarin.Mac.Tasks

* Added Xamarin.Messaging.Apple.Tasks project and VerifyXcodeVersion Task

* Fix unloaded Xamarin.Messaging.Build project

* Added Build contracts project and unified Xamarin.Messaigng.Apple.Tasks in Xamarin.iOS.Tasks.Windows

Also added missing tasks and changes .After.targets

* Updated Xamarin.Messaging version

* Build agent - reference MSBuild assemblies from the framework

Since the assemblies will be included in the build agent we need those to be the ones that come from the framework to be compatible with macOS

* [msbuild] Fixes _UpdateDynamicLibraryId target

The tasks con this target need to be executed remotely (when building from Windows).

* Updates resources

* Bump Xamarin.Messaging

Fixes problems when executing Exec task remotely

* [dotnet] Overrides Publish targets to execute them remotely from Windows

The `_CopyResolvedFilesToPublishPreserveNewest` and `_CopyResolvedFilesToPublishAlways` targets essentially copy files into the app bundle. Since those are part of the .NET SDK we need to override those so we can pass to the Copy task the SessionId parameter and then it will be executed remotely when building from Windows.

This is done in a Windows.After.targets file so it won't affect builds on macOS.

* Added ILMerge to Xamarin.iOS.Tasks.Windows

Also modified ILMerge.targets to not include System assemblies because we don't need them on the Windows package

* Bumps Messaging

This new version of messaging fixes a problem when copying task inputs from Windows to the Mac

* [dotnet] Fixes copying files to the Mac when building from Windows

When building from Windows there are .NET SDK targets that copy dynamic libraries from the SDK to the intermediate output directory or other files to the publish directory, since we can't control those we can't run them remotely so we need to copy those files to the Mac to ensure other targets will find those.

* [dotnet] Fixes how files are copied to the output dir

- Before executing `_CopyResolvedFilesToPublishPreserveNewest` and `_CopyResolvedFilesToPublishAlways` we copy the input files for those targets to the Mac
- Then we override the original targets to execute the same copy task as the original ones but on the Mac, so the output files are placed in the right location for the following targets to pick them up.

* Fixes typo on Xamarin.iOS.Common.After.targets

* Bumps Xamarin.Messaging

* [msbuild] Fixes VerifyXcodeVersion and ResolveUTIs tasks

Both tasks were not being able to connect to the Mac mostly because of ILRepack, there were kind of 2 versions of Xamarin.Messaging, one merged into Xamarin.iOS.Tasks and another one merged into Xamarin.iOS.Windows.Tasks. Because of this the build connection object registered on the task could not be casted to the build connection type.

This essentially moves both tasks into the Xamarin.iOS.Tasks assembly to avoid this issue, and as part of that also includes the Messaging contracts into that same project.

* [msbuild] Fixes warnings when building from Windows

* [dotnet] Adds missing assemblies to merge into Xamarin.iOS.Tasks

Those 2 new assemblies will only be used from Windows and we need their implementation instead of the ref assemblies. In the future we will need to find a way of doing this on the Windows only pack insted of doing it on the core Xamarin.iOS.Tasks assembly.

* [dotnet] Compute PublishTrimmed on a target

We need to do this so the property is evaluated after VS on Windows connects to the Mac, otherwise by default IsMacEnabled is false from Windows.

* Bumps Messaging to 1.2.111

* [dotnet] Execute ILLink remotely when building from Windows

- Overrides the ILLink task and _RunILLink target to add the hability to execute it remotely, adding input and output properties so files are copied to the server and output files are created on Windows.
- This "custom" ILLink task will only be executed from the Windows targets so when building from a Mac it will execute the core SDK task.

* [dotnet] Fixes intput/output files creation for linker tasks

- Custom Linker options file should be created on the Mac so we need to execute WriteLinesToFile remotely
- All the *.items files from the linker are created on the Mac so we need to execute ReadItemsFromFile remotely
- CompileNativeCode: fixes the OutputFile metadata path, otherwise the execution fails; also copies all the files in the declared "IncludeDirectories" to the Mac
- Avoids copying input files from Windows to the Mac when running LinkNativeCode since the real input files already exist on the Mac, and Windows contains only empty files just to make MSBuild inputs/outputs check work. If we copy those empty files to the Mac we brake the build.

* [msbuild] Minor fixes after merging from main

* [dotnet] Adds missing output files to the Xamarin.iOS.Tasks.Windows project

The output of this project was missing Messaging build targets and the build agent zip file that are needed to create the dotnet Windows specific pack

* [dotnet] Fixes dotnet Windows specific pack generation

Ensures the Windows projects are built and the files are copied to the dotnet pack directory before creating the package.

It also adds a variable to enable building this pack.

* [dotnet] Adds iOS Windows specific pack to iOS only MSI

There's only a Windows specific pack for iOS available for now, so we should only add it to the iOS SDK MSI

* [dotnet] Create a separate bundle for the iOS Windows MSI

We need to do this to avoid including the Windows specific pack in the pkg. Also for now we'll only create an MSI for iOS since it's the only supported platform from Windows.

* Fixes spacing issues in Xamarin.iOS.Tasks.csproj

* Bumps Touch.Unit back to 05db76

* Fixes formatting problems

* [msbuild] Replaces error E0176 by E0186

Because there's a warning W0176 that will overlap with the error

* [msbuild] Fixes CompileEntitlements task

There were 2 problems:
1- The if statement on the DefaultEntitlementsPath was wrong, because we should return the base value if there's no SessionId (which means the task is running on a Mac)
2- We should copy to the Mac the default entitlements file if no custom file was specified

* Several fixes to cleanup the code to support iOS from Windows

* Apply suggestions from code review

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

* Formatting fixes in Xamarin.Messaging.Build

* Reverted formatting changes in CompileEntitlements.cs

* More formatting fixes

* Update msbuild/Messaging/Xamarin.Messaging.Build/Handlers/ExecuteTaskMessageHandler.cs

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

* Fixes order of MSBuild errors in the resource file

* Add newly added localizable strings to canary test of translated strings.

* Delete tests that ensure theres code only on the abstract tasks

These were needed to ensure all the code was in the base tasks so we could have tasks implementations on Windows to remote those. Now that code is part of this repo (and that is why these tests are failing now) so we do not need them anymore.

* [dotnet] Don't build the Windows SDK pack if not configured to do so.

Co-authored-by: mag <mauro.agnoletti@gmail.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2021-02-12 07:43:17 +01:00
Sebastien Pouliot 851ec37f2b
[main] Update NuGet feed (#10599)
bump maccore for dependencies updates

New commits in xamarin/maccore:

* xamarin/maccore@b5332e51dd Remove dependency on XmlDocSync repo/tools (#2391)
* xamarin/maccore@e2a8db0a93 Update NuGet.config to enforce a single feed (#2372)
* xamarin/maccore@1a2648bfea Keychain file computed incorrectly on Big Sur (#2388)
* xamarin/maccore@de616ca53e [mlaunch] Fix dependencies for Xcode 12.5 beta 1 (#2387)
* xamarin/maccore@e93375583c [Actions] Fix rebase trigger.

Diff: 0dfeb85ff6..b5332e51dd
2021-02-09 20:45:35 -05:00
Rolf Bjarne Kvinge 39e3184f02
[src] Build the .NET version of our product assemblies using a .NET 5 BCL. (#9637)
* [src] Build the .NET version of our product assemblies using a .NET 5 BCL.

We're not shipping the .NET product assemblies in any stable release, so we
can use a preview version of the .NET 5 BCL.

Also:

* Add all the nuget feeds we need to the top-level NuGet.config, even for .NET
  5/6, there shouldn't be any conflicts with stable feeds since we use exact
  version numbers.

* Generate a top-level global5.json which is copied to every directory that
  needs a .NET 5 global.json (overriding the .NET 3.1 global.json in the root
  directory).

* Use the expected dotnet binary during our local build.

* [tests] Fix the bgen tests to use .NET 5.

* [xharness] Set the current directory to the project directory when running .NET tests.

This way we end up using the dotnet version that's configured in global.json for the tests.
2020-09-21 13:22:44 +02:00
Waleed Chaudhry 729e241e4a
[Localization] Add generator error messages (#7531) 2020-01-08 16:07:46 -05:00
Rolf Bjarne Kvinge 3351e2a633 Add a 'repositorypath' to our NuGet.Config and update paths everywhere accordingly. (#1110)
This makes us only put packages in one directory (saves disk space and time),
and it also makes project files in multiple solutions work properly
(mtouch.csproj is in tests/tests.sln and tests/mtouch/mtouch.sln).
2016-11-04 09:13:33 +01:00
Rolf Bjarne Kvinge 06821f5cc7 Add a nuget config file to ensure we have a valid feed. (#271)
This will hopefully fix a random build problem on some machines:

[5:14:32] cat ~/.config/NuGet/NuGet.Config || true
[5:14:32] <?xml version="1.0" encoding="utf-8"?>
[5:14:32] <configuration>
[5:14:32]   <packageSources>
[5:14:32]     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
[5:14:32]   </packageSources>
[5:14:32] </configuration>
[5:14:32] Targets files are valid XML
[5:14:33] Installing 'NUnit.Runners 2.6.4'.
[5:14:33] Installing 'NUnit 2.6.4'.
[5:14:33] Installing 'Newtonsoft.Json 6.0.8'.
[5:14:33] Successfully installed 'NUnit 2.6.4'.
[5:14:33] Successfully installed 'Newtonsoft.Json 6.0.8'.
[5:14:33] Successfully installed 'NUnit.Runners 2.6.4'.
[5:14:33] Unable to find version '0.9.5' of package 'Mono.Cecil'.
2016-06-24 11:13:07 -07:00