Skip to content

Commit 055618c

Browse files
rmarinhormarinho
authored
[release/9.0.1xx-preview1] Revert "Dont build net8" (#20286)
* Revert "Dont build net8" This reverts commit 4d59c64. * Update versions * Update Compatibility.csproj * Update versions * Update dotnet.cake Update dotnet.cake Set env variables before build device tests Update DotnetInternal.cs Update dotnet.cake * Don't build template tests again
1 parent 9ee714a commit 055618c

16 files changed

+92
-85
lines changed

Diff for: ‎Directory.Build.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
88
<_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>
99

10-
<!-- <_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">8</_MauiPreviousDotNetVersionMajor>
10+
<_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">8</_MauiPreviousDotNetVersionMajor>
1111
<_MauiPreviousDotNetVersionMinor Condition="'$(_MauiPreviousDotNetVersionMinor)' == ''">0</_MauiPreviousDotNetVersionMinor>
1212
<_MauiPreviousDotNetVersion Condition="'$(_MauiPreviousDotNetVersion)' == ''">$(_MauiPreviousDotNetVersionMajor).$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersion>
1313
<_MauiPreviousDotNetVersionNoDot Condition="'$(_MauiPreviousDotNetVersionNoDot)' == ''">$(_MauiPreviousDotNetVersionMajor)$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersionNoDot>
14-
<_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiPreviousDotNetTfm> -->
14+
<_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiPreviousDotNetTfm>
1515

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

110-
<!-- <WindowsMauiPreviousPlatforms Condition="'$(WindowsMauiPreviousPlatforms)' == ''">net$(_MauiPreviousDotNetVersion)-windows$(WindowsTargetFrameworkVersion);net$(_MauiPreviousDotNetVersion)-windows$(Windows2TargetFrameworkVersion)</WindowsMauiPreviousPlatforms>
110+
<WindowsMauiPreviousPlatforms Condition="'$(WindowsMauiPreviousPlatforms)' == ''">net$(_MauiPreviousDotNetVersion)-windows$(WindowsTargetFrameworkVersion);net$(_MauiPreviousDotNetVersion)-windows$(Windows2TargetFrameworkVersion)</WindowsMauiPreviousPlatforms>
111111
<MauiPreviousPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-tizen;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
112112
<MauiPreviousPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPreviousPlatforms);$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
113113
<MauiPreviousPlatforms Condition="'$(IncludeAndroidTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-android;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
114114
<MauiPreviousPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-maccatalyst;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
115-
<MauiPreviousPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-ios;$(MauiPreviousPlatforms)</MauiPreviousPlatforms> -->
115+
<MauiPreviousPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-ios;$(MauiPreviousPlatforms)</MauiPreviousPlatforms>
116116

117117
<!-- Device Tests TFMs (no Tizen yet) -->
118118
<MauiDeviceTestsPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPlatforms);$(MauiDeviceTestsPlatforms)</MauiDeviceTestsPlatforms>
@@ -123,8 +123,8 @@
123123
<!-- Graphics TFMs -->
124124
<MauiGraphicsPlatforms>$(MauiPlatforms)</MauiGraphicsPlatforms>
125125
<MauiGraphicsPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPlatforms);net$(_MauiDotNetVersion)-macos</MauiGraphicsPlatforms>
126-
<!-- <MauiGraphicsPreviousPlatforms>$(MauiPreviousPlatforms)</MauiGraphicsPreviousPlatforms>
127-
<MauiGraphicsPreviousPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPreviousPlatforms);net$(_MauiPreviousDotNetVersion)-macos</MauiGraphicsPreviousPlatforms> -->
126+
<MauiGraphicsPreviousPlatforms>$(MauiPreviousPlatforms)</MauiGraphicsPreviousPlatforms>
127+
<MauiGraphicsPreviousPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPreviousPlatforms);net$(_MauiPreviousDotNetVersion)-macos</MauiGraphicsPreviousPlatforms>
128128
</PropertyGroup>
129129

130130
<PropertyGroup>

Diff for: ‎eng/Version.Details.xml

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.1.24080.9">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.1.24101.2">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>46ba867793d0599759fbb8f1ac07a3f75cb2ea9d</Sha>
5+
<Sha>6bbd460f4db0a37cafeb04a1ed2d798ae56b0283</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.1.24080.9">
88
<Uri>https://github.com/dotnet/runtime</Uri>
99
<Sha>1d1bf92fcf43aa6981804dc53c5174445069c9e4</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.1.146">
11+
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.1.148">
1212
<Uri>https://github.com/xamarin/xamarin-android</Uri>
13-
<Sha>b2c6c7c0558cbe9c1dd6850eddc9ec3acd1d33bc</Sha>
13+
<Sha>d18cbfe1e988220163513d705e37266f7c61e3ce</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.2.9085-net9-p1">
1616
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
@@ -35,49 +35,49 @@
3535
<Uri>https://github.com/dotnet/emsdk</Uri>
3636
<Sha>e8ab136db368ccb85c572d2c1541e3056883df3c</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.1.24080.2">
38+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.1.24081.5">
3939
<Uri>https://github.com/dotnet/aspnetcore</Uri>
40-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
40+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.1.24080.2">
42+
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.1.24081.5">
4343
<Uri>https://github.com/dotnet/aspnetcore</Uri>
44-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
44+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.1.24080.2">
46+
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.1.24081.5">
4747
<Uri>https://github.com/dotnet/aspnetcore</Uri>
48-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
48+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.1.24080.2">
50+
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.1.24081.5">
5151
<Uri>https://github.com/dotnet/aspnetcore</Uri>
52-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
52+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.1.24080.2">
54+
<Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.1.24081.5">
5555
<Uri>https://github.com/dotnet/aspnetcore</Uri>
56-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
56+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.1.24080.2">
58+
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.1.24081.5">
5959
<Uri>https://github.com/dotnet/aspnetcore</Uri>
60-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
60+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.1.24080.2">
62+
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.1.24081.5">
6363
<Uri>https://github.com/dotnet/aspnetcore</Uri>
64-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
64+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.1.24080.2">
66+
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.1.24081.5">
6767
<Uri>https://github.com/dotnet/aspnetcore</Uri>
68-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
68+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.1.24080.2">
70+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.1.24081.5">
7171
<Uri>https://github.com/dotnet/aspnetcore</Uri>
72-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
72+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.1.24080.2">
74+
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.1.24081.5">
7575
<Uri>https://github.com/dotnet/aspnetcore</Uri>
76-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
76+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.1.24080.2">
78+
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.1.24081.5">
7979
<Uri>https://github.com/dotnet/aspnetcore</Uri>
80-
<Sha>688559886575a7f0d84b771de5c17501d5daaedc</Sha>
80+
<Sha>b1beadfe0ad3d02eb5207681a5328793c4b3822c</Sha>
8181
</Dependency>
8282
<Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-preview.2.22102.8">
8383
<Uri>https://github.com/dotnet/templating</Uri>

Diff for: ‎eng/Versions.props

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
44
<MicrosoftMauiPreviousDotNetReleasedVersion>8.0.3</MicrosoftMauiPreviousDotNetReleasedVersion>
55
<!-- dotnet/installer -->
6-
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.1.24080.9</MicrosoftDotnetSdkInternalPackageVersion>
6+
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.1.24101.2</MicrosoftDotnetSdkInternalPackageVersion>
77
<!-- dotnet/runtime -->
88
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.1.24080.9</MicrosoftNETCoreAppRefPackageVersion>
99
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
@@ -23,7 +23,7 @@
2323
<MicrosoftExtensionsLoggingDebugVersion>9.0.0-preview.1.24080.9</MicrosoftExtensionsLoggingDebugVersion>
2424
<MicrosoftExtensionsPrimitivesVersion>9.0.0-preview.1.24080.9</MicrosoftExtensionsPrimitivesVersion>
2525
<!-- xamarin/xamarin-android -->
26-
<MicrosoftAndroidSdkWindowsPackageVersion>34.99.0-preview.1.146</MicrosoftAndroidSdkWindowsPackageVersion>
26+
<MicrosoftAndroidSdkWindowsPackageVersion>34.99.0-preview.1.148</MicrosoftAndroidSdkWindowsPackageVersion>
2727
<!-- xamarin/xamarin-macios -->
2828
<MicrosoftMacCatalystSdkPackageVersion>17.2.9085-net9-p1</MicrosoftMacCatalystSdkPackageVersion>
2929
<MicrosoftmacOSSdkPackageVersion>14.2.9085-net9-p1</MicrosoftmacOSSdkPackageVersion>
@@ -39,17 +39,17 @@
3939
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
4040
<MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
4141
<!-- Everything else -->
42-
<MicrosoftAspNetCoreAuthorizationPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthorizationPackageVersion>
43-
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
44-
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
45-
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
46-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
47-
<MicrosoftAspNetCoreComponentsFormsPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsFormsPackageVersion>
48-
<MicrosoftAspNetCoreComponentsPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsPackageVersion>
49-
<MicrosoftAspNetCoreComponentsWebPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsWebPackageVersion>
50-
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
51-
<MicrosoftAspNetCoreMetadataPackageVersion>9.0.0-preview.1.24080.2</MicrosoftAspNetCoreMetadataPackageVersion>
52-
<MicrosoftJSInteropPackageVersion>9.0.0-preview.1.24080.2</MicrosoftJSInteropPackageVersion>
42+
<MicrosoftAspNetCoreAuthorizationPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthorizationPackageVersion>
43+
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
44+
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
45+
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
46+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
47+
<MicrosoftAspNetCoreComponentsFormsPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsFormsPackageVersion>
48+
<MicrosoftAspNetCoreComponentsPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsPackageVersion>
49+
<MicrosoftAspNetCoreComponentsWebPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsWebPackageVersion>
50+
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
51+
<MicrosoftAspNetCoreMetadataPackageVersion>9.0.0-preview.1.24081.5</MicrosoftAspNetCoreMetadataPackageVersion>
52+
<MicrosoftJSInteropPackageVersion>9.0.0-preview.1.24081.5</MicrosoftJSInteropPackageVersion>
5353
<!-- Other packages -->
5454
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview*</MicrosoftCodeAnalysisNetAnalyzersVersion>
5555
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>

Diff for: ‎eng/cake/dotnet.cake

+3-2
Original file line numberDiff line numberDiff line change
@@ -543,16 +543,17 @@ Dictionary<string, string> GetDotNetEnvironmentVariables()
543543

544544
}
545545

546-
void SetDotNetEnvironmentVariables()
546+
void SetDotNetEnvironmentVariables(string dotnetDir = null)
547547
{
548-
var dotnet = MakeAbsolute(Directory("./bin/dotnet/")).ToString();
548+
var dotnet = dotnetDir ?? MakeAbsolute(Directory("./bin/dotnet/")).ToString();
549549

550550
SetEnvironmentVariable("VSDebugger_ValidateDotnetDebugLibSignatures", "0");
551551
SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
552552
SetEnvironmentVariable("DOTNET_ROOT", dotnet);
553553
SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
554554
SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
555555
SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true");
556+
SetEnvironmentVariable("ForceNet8Current", "true");
556557
SetEnvironmentVariable("PATH", dotnet, prepend: true);
557558

558559
// Get "full" .binlog in Project System Tools

Diff for: ‎eng/cake/helpers.cake

-12
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,6 @@ public void PrintEnvironmentVariables()
9292
};
9393
}
9494

95-
void SetDotNetEnvironmentVariables(string dotnetDir)
96-
{
97-
var dotnet = dotnetDir ?? MakeAbsolute(Directory("./bin/dotnet/")).ToString();
98-
99-
SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
100-
SetEnvironmentVariable("DOTNET_ROOT", dotnet);
101-
SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
102-
SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
103-
SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true");
104-
SetEnvironmentVariable("PATH", dotnet, prepend: true);
105-
}
106-
10795
void SetEnvironmentVariable(string name, string value, bool prepend = false)
10896
{
10997
var target = EnvironmentVariableTarget.Process;

Diff for: ‎eng/devices/android.cake

+1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Task("Build")
174174
.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
175175
.Does(() =>
176176
{
177+
SetDotNetEnvironmentVariables();
177178
var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
178179
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android--{DateTime.UtcNow.ToFileTimeUtc()}.binlog";
179180

Diff for: ‎eng/devices/catalyst.cake

+4-3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Task("Build")
6868
.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
6969
.Does(() =>
7070
{
71+
SetDotNetEnvironmentVariables();
72+
7173
var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
7274
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-catalyst.binlog";
7375

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

113115
if (!IsCIBuild())
116+
{
114117
CleanDirectories(TEST_RESULTS);
118+
}
115119
else
116120
{
117121
// Because we retry on CI we don't want to delete the previous failures
118122
// We want to publish those files for reference
119123
DeleteFiles(Directory(TEST_RESULTS).Path.Combine("*.*").FullPath);
120-
121-
//SetDotNetEnvironmentVariables("/Users/runner/hostedtoolcache/dotnet");
122124
}
123125

124-
125126
var settings = new DotNetToolSettings {
126127
DiagnosticOutput = true,
127128
ToolPath = DOTNET_TOOL_PATH,

Diff for: ‎eng/devices/ios.cake

+2
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ Task("Build")
130130
.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
131131
.Does(() =>
132132
{
133+
SetDotNetEnvironmentVariables();
134+
133135
var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
134136
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-ios.binlog";
135137

Diff for: ‎src/TestUtils/src/Microsoft.Maui.IntegrationTests/AndroidTemplateTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public void AndroidTemplateTearDown()
4747

4848

4949
[Test]
50-
//[TestCase("maui", DotNetPrevious, "Debug")]
51-
//[TestCase("maui", DotNetPrevious, "Release")]
50+
[TestCase("maui", DotNetPrevious, "Debug")]
51+
[TestCase("maui", DotNetPrevious, "Release")]
5252
[TestCase("maui", DotNetCurrent, "Debug")]
5353
[TestCase("maui", DotNetCurrent, "Release")]
54-
//[TestCase("maui-blazor", DotNetPrevious, "Debug")]
55-
//[TestCase("maui-blazor", DotNetPrevious, "Release")]
54+
[TestCase("maui-blazor", DotNetPrevious, "Debug")]
55+
[TestCase("maui-blazor", DotNetPrevious, "Release")]
5656
[TestCase("maui-blazor", DotNetCurrent, "Debug")]
5757
[TestCase("maui-blazor", DotNetCurrent, "Release")]
5858
public void RunOnAndroid(string id, string framework, string config)

Diff for: ‎src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public void AppleTemplateFxtTearDown()
2525
}
2626

2727
[Test]
28-
//[TestCase("maui", "Debug", DotNetPrevious)]
29-
//[TestCase("maui", "Release", DotNetPrevious)]
28+
[TestCase("maui", "Debug", DotNetPrevious)]
29+
[TestCase("maui", "Release", DotNetPrevious)]
3030
[TestCase("maui", "Debug", DotNetCurrent)]
3131
[TestCase("maui", "Release", DotNetCurrent)]
32-
//[TestCase("maui-blazor", "Debug", DotNetPrevious)]
33-
//[TestCase("maui-blazor", "Release", DotNetPrevious)]
32+
[TestCase("maui-blazor", "Debug", DotNetPrevious)]
33+
[TestCase("maui-blazor", "Release", DotNetPrevious)]
3434
[TestCase("maui-blazor", "Debug", DotNetCurrent)]
3535
[TestCase("maui-blazor", "Release", DotNetCurrent)]
3636
public void RunOniOS(string id, string config, string framework)

0 commit comments

Comments
 (0)