jsuarezruiz
/
maui-linux
зеркало из https://github.com/jsuarezruiz/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[main] Update dependencies from xamarin/xamarin-android (#1577) 

* Update dependencies from https://github.com/xamarin/xamarin-android build main-e5103b0f97d542ce14f2ceb9f2d3a247aa6d5964-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.73

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20210707.26

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142

* Full Android workload has been renamed to android-aot

If you don't need AOT, the `android` workload excludes it.

Note that AOT isn't working yet, but we have the Mono packs setup.

* Use shortened Apple platform workload names

The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.

* One more place the android workload name is used

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20210707.26

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142

Conflicts:
    eng/Versions.props

* Use shortened Apple platform workload names

The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.

* Update dependencies from https://github.com/xamarin/xamarin-android build main-7c5fab13329ee898fb1562f83576a7ca881f2881-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.75

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20210709.17

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.150

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20210713.6

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.159

* Revert "[build] remove workaround for iOS AOT packages on Windows"

This reverts commit 5231ec3509c89325dfcfbe6ced89887d801b3f71.

* Add NoWarn=CS8032 for Razor

* Update dependencies from https://github.com/xamarin/xamarin-android build main-e06d71320c8f5cebb31c42b15d8172b087a98761-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.77

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Revert "Add NoWarn=CS8032 for Razor"

This reverts commit d7212d435c1341e80742bbca9e76e7cb4a201e47.

* Update dependencies from https://github.com/xamarin/xamarin-android build main-1d53c0095871293c38d16196982e83485a091a3f-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.81

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Do it like a madman

* Update dependencies from https://github.com/xamarin/xamarin-android build main-7dacdd751dd0bd7b02ac443c32824f353a6da380-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.83

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/xamarin/xamarin-android build main-24f272bd357d67a5e326d4cce55899a5b98905ae-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.84

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal


Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
This commit is contained in:
dotnet-maestro[bot] 2021-07-19 20:48:03 +02:00 коммит произвёл GitHub
Родитель fba6a03ba9
Коммит 51d8407d55
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 107 добавлений и 74 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Directory.Build.targets
Просмотреть файл

@ -33,4 +33,10 @@
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>
<!-- Until we get a new enough dotnet -->
<ItemGroup>
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.19" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.19" />
</ItemGroup>
</Project>

1
build.cake
Просмотреть файл

@ -96,6 +96,7 @@ NUNIT_TEST_WHERE = ParseDevOpsInputs(NUNIT_TEST_WHERE);
var ANDROID_HOME = EnvironmentVariable("ANDROID_HOME") ??
(IsRunningOnWindows () ? "C:\\Program Files (x86)\\Android\\android-sdk\\" : "");
string MSBuildExe = Argument("msbuild", EnvironmentVariable("MSBUILD_EXE", ""));
string MSBuildArgumentsENV = EnvironmentVariable("MSBuildArguments", "");
string MSBuildArgumentsARGS = Argument("MSBuildArguments", "");
string MSBuildArguments;

88
eng/Version.Details.xml
Просмотреть файл

@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21355.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21327.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>7f8e0d76c0862f3afab687505b4177d52b42808f</Sha>
<Sha>e8b3b6bea1e37086869ba9aeafe65caa298537e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.6.62">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-ci.main.84">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>9a7da6d3e943544abbf67758b50fd5afb21875cc</Sha>
<Sha>24f272bd357d67a5e326d4cce55899a5b98905ae</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-ci.main.162">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
@ -28,81 +28,81 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>a202354c711b3d0e09e595c3f257b438bc8b3bec</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21353.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21323.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>25aa8d68892fc742ac6ab7bd48813dea9d5c23f7</Sha>
<Sha>30d2e1ff863eaaf8fdadfc31aebfe653196a93b4</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>

44
eng/Versions.props
Просмотреть файл

@ -1,32 +1,32 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21355.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.6.62</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21326.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-ci.main.84</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-ci.main.162</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.0.100-ci.main.162</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.0.100-ci.main.162</MicrosofttvOSSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.0.100-ci.main.162</MicrosoftmacOSSdkPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-preview.6.21355.2</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftJSInteropPackageVersion>6.0.0-preview.6.21355.2</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-preview.6.21353.1</MicrosoftWindowsDesktopAppRuntimewinx64Version>
<SystemCodeDomPackageVersion>6.0.0-preview.6.21352.12</SystemCodeDomPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-preview.7.21325.3</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftJSInteropPackageVersion>6.0.0-preview.7.21325.3</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-preview.7.21323.1</MicrosoftWindowsDesktopAppRuntimewinx64Version>
<SystemCodeDomPackageVersion>6.0.0-preview.7.21324.24</SystemCodeDomPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->

3
eng/cake/dotnet.cake
Просмотреть файл

@ -197,6 +197,9 @@ Task("SAMPLE-MAC")
string FindMSBuild()
{
if (!string.IsNullOrWhiteSpace(MSBuildExe))
return MSBuildExe;
if (IsRunningOnWindows())
{
var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true });

4
eng/pipelines/common/variables.yml
Просмотреть файл

@ -34,8 +34,8 @@ variables:
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
- name: provisionator.path
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
- name: provisionator.vs2019
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/vs2019.csx'
- name: provisionator.vs
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/vs.csx'
- name: provisionator.extraArguments
value: '--v'
- name: DotNet.Dir

7
eng/pipelines/handlers.yml
Просмотреть файл

@ -144,11 +144,12 @@ stages:
- task: xamops.azdevex.provisionator-task.provisionator@1
displayName: 'Provision VSWindows'
inputs:
provisioning_script: $(provisionator.vs2019)
provisioning_script: $(provisionator.vs)
- script: dotnet tool restore
displayName: install dotnet tools
- powershell: |
& dotnet cake --target=VS-WINUI-CI --configuration=${{ BuildCondition }}
$msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe"
& dotnet cake --target=VS-WINUI-CI --configuration=${{ BuildCondition }} --msbuild="$msbuild"
displayName: 'Build WinUI SLN'
- task: CopyFiles@2
displayName: 'Copy Bin Log Files'
@ -249,7 +250,7 @@ stages:
- task: xamops.azdevex.provisionator-task.provisionator@1
displayName: 'Provision VSWindows'
inputs:
provisioning_script: $(provisionator.vs2019)
provisioning_script: $(provisionator.vs)
- script: dotnet tool restore
displayName: install dotnet tools

2
eng/provisioning/vs2019.csx → eng/provisioning/vs.csx
Просмотреть файл

@ -1,4 +1,4 @@
VisualStudio (VisualStudioChannel.Preview, VisualStudioTier.Enterprise, 16, @"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview", true)
VisualStudio (VisualStudioChannel.Preview, VisualStudioTier.Enterprise, 17, @"%ProgramFiles%\Microsoft Visual Studio\2022\Preview", true)
.Workload (VisualStudioWorkload.ManagedDesktop)
.Workload (VisualStudioWorkload.NetCrossPlat)
.Workload (VisualStudioWorkload.Universal);

24
src/DotNet/DotNet.csproj
Просмотреть файл

@ -27,6 +27,8 @@
</_ProvisionDependsOn>
</PropertyGroup>
<Import Project="$(MauiRootDirectory)eng/ReplaceText.targets" />
<!-- Build target provisions ./bin/dotnet/ -->
<Target Name="_Provision" BeforeTargets="Build" DependsOnTargets="$(_ProvisionDependsOn)" />
@ -138,7 +140,7 @@
<_PacksToRemove Include="Microsoft.NET.Workload.tvOS" />
<_PacksToRemove Include="Microsoft.NET.Workload.macOS" />
<!-- Ids for 'dotnet workload install' -->
<_WorkloadIds Include="microsoft-android-sdk-full" />
<_WorkloadIds Include="android-aot" />
<_WorkloadIds Include="maccatalyst" />
<_WorkloadIds Include="macos" />
<_WorkloadIds Include="ios" />
@ -171,6 +173,26 @@
VersionBand="$(DotNetPreviewVersionBand)"
/>
<!-- HACK: temporary fixes for iOS and MacCatalyst workloads -->
<ReplaceText
Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
OldValue="Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst&quot;"
NewValue="Condition=&quot;%24([MSBuild]::IsOSPlatform('osx'))&quot; Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst&quot;"
/>
<ReplaceText
Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
OldValue="Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm&quot;"
NewValue="Condition=&quot;%24([MSBuild]::IsOSPlatform('osx'))&quot; Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm&quot;"
/>
<ReplaceText
Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
OldValue="Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64&quot;"
NewValue="Condition=&quot;%24([MSBuild]::IsOSPlatform('osx'))&quot; Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64&quot;"
/>
<Touch Files="$(DotNetSdkManifestsDirectory).stamp" AlwaysCreate="true" />
</Target>

2
src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json
Просмотреть файл

@ -38,7 +38,7 @@
"description": ".NET MAUI SDK for Android",
"extends": [
"maui-core",
"microsoft-android-sdk-full"
"android"
],
"packs": [
"Microsoft.Maui.Core.Ref.android",