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

Update to Preview 7 #8884

Merged
merged 7 commits into from
Jul 22, 2022
Merged

Update to Preview 7 #8884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
61f23ee
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Jul 21, 2022
9bb51cd
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 21, 2022
73018fb
Update Tizen workload.
mattleibow Jul 21, 2022
d8c3fff
Add more logging
mattleibow Jul 21, 2022
0253478
Try log the logging
mattleibow Jul 21, 2022
8e03ba6
logging
mattleibow Jul 21, 2022
a58fa23
Disable interpreter (UseInterpreter=False)
mattleibow Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.6.22316.8" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.7.22362.31" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>970be08e7ce46452911c8638ec7d4a3c0b6bd534</Sha>
<Sha>d2fff6df585efa03cbe883b4fb6ce41be8d61342</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22312.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5c5e66e6c067f8a82d514598575011cd21655ffb</Sha>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-preview.6.74">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-preview.7.97">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>2197a45920c656094f4737868a4462f76a08eea0</Sha>
<Sha>3387f5e16d6a98627fbb3c63bc62d004e3d0d6e7</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.906-preview.7">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.907-preview.7">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9f7f1cef5ffbf066ec5fba5ed972570eda32cc43</Sha>
<Sha>11ed26e529f0e1711c848e1ca729e04c5ec7382d</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="15.4.906-preview.7">
<Dependency Name="Microsoft.iOS.Sdk" Version="15.4.907-preview.7">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9f7f1cef5ffbf066ec5fba5ed972570eda32cc43</Sha>
<Sha>11ed26e529f0e1711c848e1ca729e04c5ec7382d</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.906-preview.7">
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.907-preview.7">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9f7f1cef5ffbf066ec5fba5ed972570eda32cc43</Sha>
<Sha>11ed26e529f0e1711c848e1ca729e04c5ec7382d</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.906-preview.7">
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.907-preview.7">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9f7f1cef5ffbf066ec5fba5ed972570eda32cc43</Sha>
<Sha>11ed26e529f0e1711c848e1ca729e04c5ec7382d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22281.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22330.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ea10b4e5534de1806cc2e84ddd3b00eabcab962f</Sha>
<Sha>40e7c6226711ec616ee07e725563eda708630fe1</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.408</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.6.22316.8</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22362.31</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22312.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>6.0.1</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-preview.6.74</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-preview.7.97</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.4.906-preview.7</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.906-preview.7</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.906-preview.7</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.4.906-preview.7</MicrosofttvOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.4.907-preview.7</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.907-preview.7</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.907-preview.7</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.4.907-preview.7</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100-preview.6.14</SamsungTizenSdkPackageVersion>
<SamsungTizenSdkPackageVersion>7.0.100-preview.7.20</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion>7.0.0-preview.6.22281.1</MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion>7.0.0-preview.7.22330.1</MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.1.2</MicrosoftWindowsAppSDKPackageVersion>
Expand Down
6 changes: 6 additions & 0 deletions eng/devices/android.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ Task("Test")
Information("Waited {0} seconds for the emulator to boot up.", waited);
}

Information("Setting the ADB properties...");
var lines = AdbShell("setprop debug.mono.log default,mono_log_level=debug,mono_log_mask=all", adbSettings);
Information("{0}", string.Join("\n", lines));
lines = AdbShell("getprop debug.mono.log", adbSettings);
Information("{0}", string.Join("\n", lines));

var settings = new DotNetCoreToolSettings {
DiagnosticOutput = true,
ArgumentCustomization = args=>args.Append("run xharness android test " +
Expand Down
1 change: 1 addition & 0 deletions src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>Microsoft.Maui.MauiBlazorWebView.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.MauiBlazorWebView.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Core/tests/DeviceTests/Core.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Core.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<SingleProject>true</SingleProject>
<RootNamespace>Microsoft.Maui.Essentials.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Essentials.DeviceTests</AssemblyName>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down