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

[release/9.0.1xx-preview1] Revert "Dont build net8" #20286

Merged
merged 6 commits into from Feb 2, 2024
Merged

[release/9.0.1xx-preview1] Revert "Dont build net8" #20286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3dbc33d
Revert "Dont build net8"
rmarinho Feb 1, 2024
d54cde7
Update versions
rmarinho Feb 1, 2024
6f75f0e
Update Compatibility.csproj
rmarinho Feb 1, 2024
70dff82
Update versions
rmarinho Feb 1, 2024
0fa8b78
Update dotnet.cake
rmarinho Feb 1, 2024
f9bc8ab
Don't build template tests again
rmarinho Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Expand Up @@ -7,11 +7,11 @@
<_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
<_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>

<!-- <_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">8</_MauiPreviousDotNetVersionMajor>
<_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">8</_MauiPreviousDotNetVersionMajor>
<_MauiPreviousDotNetVersionMinor Condition="'$(_MauiPreviousDotNetVersionMinor)' == ''">0</_MauiPreviousDotNetVersionMinor>
<_MauiPreviousDotNetVersion Condition="'$(_MauiPreviousDotNetVersion)' == ''">$(_MauiPreviousDotNetVersionMajor).$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersion>
<_MauiPreviousDotNetVersionNoDot Condition="'$(_MauiPreviousDotNetVersionNoDot)' == ''">$(_MauiPreviousDotNetVersionMajor)$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersionNoDot>
<_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiPreviousDotNetTfm> -->
<_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiPreviousDotNetTfm>

<_MauiTargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</_MauiTargetPlatformIdentifier>
<_MauiNoTargetPlatform>false</_MauiNoTargetPlatform>
Expand Down Expand Up @@ -107,12 +107,12 @@
<MauiPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-maccatalyst;$(MauiPlatforms)</MauiPlatforms>
<MauiPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-ios;$(MauiPlatforms)</MauiPlatforms>

<!-- <WindowsMauiPreviousPlatforms Condition="'$(WindowsMauiPreviousPlatforms)' == ''">net$(_MauiPreviousDotNetVersion)-windows$(WindowsTargetFrameworkVersion);net$(_MauiPreviousDotNetVersion)-windows$(Windows2TargetFrameworkVersion)</WindowsMauiPreviousPlatforms>
<WindowsMauiPreviousPlatforms Condition="'$(WindowsMauiPreviousPlatforms)' == ''">net$(_MauiPreviousDotNetVersion)-windows$(WindowsTargetFrameworkVersion);net$(_MauiPreviousDotNetVersion)-windows$(Windows2TargetFrameworkVersion)</WindowsMauiPreviousPlatforms>
<MauiPreviousPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-tizen;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
<MauiPreviousPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPreviousPlatforms);$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
<MauiPreviousPlatforms Condition="'$(IncludeAndroidTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-android;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
<MauiPreviousPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-maccatalyst;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
<MauiPreviousPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-ios;$(MauiPreviousPlatforms)</MauiPreviousPlatforms> -->
<MauiPreviousPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-ios;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>

<!-- Device Tests TFMs (no Tizen yet) -->
<MauiDeviceTestsPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPlatforms);$(MauiDeviceTestsPlatforms)</MauiDeviceTestsPlatforms>
Expand All @@ -123,8 +123,8 @@
<!-- Graphics TFMs -->
<MauiGraphicsPlatforms>$(MauiPlatforms)</MauiGraphicsPlatforms>
<MauiGraphicsPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPlatforms);net$(_MauiDotNetVersion)-macos</MauiGraphicsPlatforms>
<!-- <MauiGraphicsPreviousPlatforms>$(MauiPreviousPlatforms)</MauiGraphicsPreviousPlatforms>
<MauiGraphicsPreviousPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPreviousPlatforms);net$(_MauiPreviousDotNetVersion)-macos</MauiGraphicsPreviousPlatforms> -->
<MauiGraphicsPreviousPlatforms>$(MauiPreviousPlatforms)</MauiGraphicsPreviousPlatforms>
<MauiGraphicsPreviousPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPreviousPlatforms);net$(_MauiPreviousDotNetVersion)-macos</MauiGraphicsPreviousPlatforms>
</PropertyGroup>

<PropertyGroup>
Expand Down
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
View file
Open in desktop
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.1.24080.9">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.1.24101.2">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>46ba867793d0599759fbb8f1ac07a3f75cb2ea9d</Sha>
<Sha>6bbd460f4db0a37cafeb04a1ed2d798ae56b0283</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.1.24080.9">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d1bf92fcf43aa6981804dc53c5174445069c9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.1.146">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.1.148">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>b2c6c7c0558cbe9c1dd6850eddc9ec3acd1d33bc</Sha>
<Sha>d18cbfe1e988220163513d705e37266f7c61e3ce</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.2.9085-net9-p1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -35,49 +35,49 @@
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>e8ab136db368ccb85c572d2c1541e3056883df3c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.1.24080.2">
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.1.24081.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-preview.2.22102.8">
<Uri>https://github.com/dotnet/templating</Uri>
Expand Down
26 changes: 13 additions & 13 deletions eng/Versions.props
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>8.0.3</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.1.24080.9</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.1.24101.2</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.1.24080.9</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
Expand All @@ -23,7 +23,7 @@
<MicrosoftExtensionsLoggingDebugVersion>9.0.0-preview.1.24080.9</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>9.0.0-preview.1.24080.9</MicrosoftExtensionsPrimitivesVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.99.0-preview.1.146</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.99.0-preview.1.148</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>17.2.9085-net9-p1</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>14.2.9085-net9-p1</MicrosoftmacOSSdkPackageVersion>
Expand All @@ -39,17 +39,17 @@
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
<MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
<!-- Everything else -->
<MicrosoftAspNetCoreAuthorizationPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>9.0.0-preview.1.24080.2</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>9.0.0-preview.1.24081.5</MicrosoftJSInteropPackageVersion>
<!-- Other packages -->
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview*</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
Expand Down
5 changes: 3 additions & 2 deletions eng/cake/dotnet.cake
View file
Open in desktop
Expand Up @@ -543,16 +543,17 @@ Dictionary<string, string> GetDotNetEnvironmentVariables()

}

void SetDotNetEnvironmentVariables()
void SetDotNetEnvironmentVariables(string dotnetDir = null)
{
var dotnet = MakeAbsolute(Directory("./bin/dotnet/")).ToString();
var dotnet = dotnetDir ?? MakeAbsolute(Directory("./bin/dotnet/")).ToString();

SetEnvironmentVariable("VSDebugger_ValidateDotnetDebugLibSignatures", "0");
SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
SetEnvironmentVariable("DOTNET_ROOT", dotnet);
SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true");
SetEnvironmentVariable("ForceNet8Current", "true");
SetEnvironmentVariable("PATH", dotnet, prepend: true);

// Get "full" .binlog in Project System Tools
Expand Down
12 changes: 0 additions & 12 deletions eng/cake/helpers.cake
View file
Open in desktop
Expand Up @@ -92,18 +92,6 @@ public void PrintEnvironmentVariables()
};
}

void SetDotNetEnvironmentVariables(string dotnetDir)
{
var dotnet = dotnetDir ?? MakeAbsolute(Directory("./bin/dotnet/")).ToString();

SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
SetEnvironmentVariable("DOTNET_ROOT", dotnet);
SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true");
SetEnvironmentVariable("PATH", dotnet, prepend: true);
}

void SetEnvironmentVariable(string name, string value, bool prepend = false)
{
var target = EnvironmentVariableTarget.Process;
Expand Down
1 change: 1 addition & 0 deletions eng/devices/android.cake
View file
Open in desktop
Expand Up @@ -174,6 +174,7 @@ Task("Build")
.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
.Does(() =>
{
SetDotNetEnvironmentVariables();
var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android--{DateTime.UtcNow.ToFileTimeUtc()}.binlog";

Expand Down
7 changes: 4 additions & 3 deletions eng/devices/catalyst.cake
View file
Open in desktop
Expand Up @@ -68,6 +68,8 @@ Task("Build")
.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
.Does(() =>
{
SetDotNetEnvironmentVariables();

var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-catalyst.binlog";

Expand Down Expand Up @@ -111,17 +113,16 @@ Task("Test")
Information("Test Results Directory: {0}", TEST_RESULTS);

if (!IsCIBuild())
{
CleanDirectories(TEST_RESULTS);
}
else
{
// Because we retry on CI we don't want to delete the previous failures
// We want to publish those files for reference
DeleteFiles(Directory(TEST_RESULTS).Path.Combine("*.*").FullPath);

//SetDotNetEnvironmentVariables("/Users/runner/hostedtoolcache/dotnet");
}


var settings = new DotNetToolSettings {
DiagnosticOutput = true,
ToolPath = DOTNET_TOOL_PATH,
Expand Down
2 changes: 2 additions & 0 deletions eng/devices/ios.cake
View file
Open in desktop
Expand Up @@ -130,6 +130,8 @@ Task("Build")
.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
.Does(() =>
{
SetDotNetEnvironmentVariables();

var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-ios.binlog";

Expand Down
8 changes: 4 additions & 4 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/AndroidTemplateTests.cs
View file
Open in desktop
Expand Up @@ -47,12 +47,12 @@ public void AndroidTemplateTearDown()


[Test]
//[TestCase("maui", DotNetPrevious, "Debug")]
//[TestCase("maui", DotNetPrevious, "Release")]
[TestCase("maui", DotNetPrevious, "Debug")]
[TestCase("maui", DotNetPrevious, "Release")]
[TestCase("maui", DotNetCurrent, "Debug")]
[TestCase("maui", DotNetCurrent, "Release")]
//[TestCase("maui-blazor", DotNetPrevious, "Debug")]
//[TestCase("maui-blazor", DotNetPrevious, "Release")]
[TestCase("maui-blazor", DotNetPrevious, "Debug")]
[TestCase("maui-blazor", DotNetPrevious, "Release")]
[TestCase("maui-blazor", DotNetCurrent, "Debug")]
[TestCase("maui-blazor", DotNetCurrent, "Release")]
public void RunOnAndroid(string id, string framework, string config)
Expand Down
8 changes: 4 additions & 4 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ public void AppleTemplateFxtTearDown()
}

[Test]
//[TestCase("maui", "Debug", DotNetPrevious)]
//[TestCase("maui", "Release", DotNetPrevious)]
[TestCase("maui", "Debug", DotNetPrevious)]
[TestCase("maui", "Release", DotNetPrevious)]
[TestCase("maui", "Debug", DotNetCurrent)]
[TestCase("maui", "Release", DotNetCurrent)]
//[TestCase("maui-blazor", "Debug", DotNetPrevious)]
//[TestCase("maui-blazor", "Release", DotNetPrevious)]
[TestCase("maui-blazor", "Debug", DotNetPrevious)]
[TestCase("maui-blazor", "Release", DotNetPrevious)]
[TestCase("maui-blazor", "Debug", DotNetCurrent)]
[TestCase("maui-blazor", "Release", DotNetCurrent)]
public void RunOniOS(string id, string config, string framework)
Expand Down