Skip to content

Commit 7f7d8ef

Browse files
kazo0kazo0
committed
chore: drop macos, bump ci uno-check
1 parent c91c381 commit 7f7d8ef

File tree

10 files changed

+31
-15
lines changed

10 files changed

+31
-15
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Chefs (WebAssembly)"],
3030
"outputCapture": "std",
3131
"timeout": 30000,
32-
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples"
32+
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples"
3333
}
3434
},
3535
{
@@ -50,7 +50,7 @@
5050
"args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Chefs (WebAssembly)"],
5151
"outputCapture": "std",
5252
"timeout": 30000,
53-
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples"
53+
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples"
5454
}
5555
},
5656
{

‎.vscode/tasks.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"type": "process",
88
"args": [
99
"build",
10-
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
10+
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
1111
"/property:GenerateFullPaths=true",
1212
"/property:TargetFramework=net9.0-browserwasm",
1313
"/consoleloggerparameters:NoSummary"
@@ -20,7 +20,7 @@
2020
"type": "process",
2121
"args": [
2222
"publish",
23-
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
23+
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
2424
"/property:GenerateFullPaths=true",
2525
"/property:TargetFramework=net9.0-browserwasm",
2626
"/consoleloggerparameters:NoSummary"
@@ -33,7 +33,7 @@
3333
"type": "process",
3434
"args": [
3535
"build",
36-
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
36+
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
3737
"/property:GenerateFullPaths=true",
3838
"/property:TargetFramework=net9.0-desktop",
3939
"/consoleloggerparameters:NoSummary"
@@ -46,7 +46,7 @@
4646
"type": "process",
4747
"args": [
4848
"publish",
49-
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
49+
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
5050
"/property:GenerateFullPaths=true",
5151
"/property:TargetFramework=net9.0-desktop",
5252
"/consoleloggerparameters:NoSummary"

‎build/workflow/pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ variables:
3636

3737
IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
3838
IsReleaseBranch: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
39-
XCODE_ROOT: '/Applications/Xcode_16.3.app'
40-
XCODE_ROOT_UITESTS: '/Applications/Xcode_16.3.app'
39+
XCODE_ROOT: '/Applications/Xcode_16.4.app'
40+
XCODE_ROOT_UITESTS: '/Applications/Xcode_16.4.app'
4141

4242
stages:
4343
- stage: Determine_Changes

‎build/workflow/stage-uitests-wasm.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,23 @@
4545
build/workflow/scripts/wasm-uitest-run.sh
4646
displayName: Run WASM UITests ($(XAML_FLAVOR_BUILD) / $(UITEST_TEST_MODE_NAME))
4747
48+
- task: CopyFiles@2
49+
displayName: 'Publish Binaries'
50+
retryCountOnTaskFailure: 3
51+
inputs:
52+
SourceFolder: $(build.sourcesdirectory)/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/bin/Release/net9.0-browserwasm/publish/wwwroot
53+
Contents: '**/*.*'
54+
TargetFolder: $(build.artifactstagingdirectory)/wwwroot
55+
CleanTargetFolder: false
56+
OverWrite: false
57+
flattenFolders: false
58+
59+
- task: PublishBuildArtifacts@1
60+
retryCountOnTaskFailure: 3
61+
condition: always()
62+
inputs:
63+
ArtifactName: wasm-uitest-build
64+
4865
- task: PublishTestResults@2
4966
condition: always()
5067
retryCountOnTaskFailure: 3

‎samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private void AddNavigationItems(MUXC.NavigationView nv)
136136
.ThenBy(x => x.Title)
137137
.GroupBy(x => x.Category)
138138
#if !DEBUG
139-
.Where(x => x.Key != SampleCategory.Tests)
139+
.Where(x => x.Key != SampleCategory.Tests)
140140
#endif
141141
;
142142

‎src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
44
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net9.0-desktop;net9.0-browserwasm</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net9.0-ios;net9.0-macos;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net9.0-ios;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
66
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net9.0-windows10.0.26100</TargetFrameworks>
77
<UnoSingleProject>true</UnoSingleProject>
88
<OutputType>Library</OutputType>

‎src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PropertyGroup>
88
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
99
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
10-
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
1111
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
1212
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
1313
<GenerateLibraryLayout>true</GenerateLibraryLayout>

‎src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PropertyGroup>
88
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
99
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
10-
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
1111
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
1212
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
1313
<GenerateLibraryLayout>true</GenerateLibraryLayout>

‎src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PropertyGroup>
88
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
99
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
10-
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
1111
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
1212
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
1313
<GenerateLibraryLayout>true</GenerateLibraryLayout>

‎src/tfms.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
<NetCurrentAndroid Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-android</NetCurrentAndroid>
88
<NetCurrentiOS Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-ios</NetCurrentiOS>
99
<NetCurrentMacCatalyst Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-maccatalyst</NetCurrentMacCatalyst>
10-
<NetCurrentMacOS Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-macos</NetCurrentMacOS>
1110
<NetCurrentWindows Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(NetCurrent)-windows10.0.19041</NetCurrentWindows>
1211

1312

14-
<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">$(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst);$(NetCurrentMacOS)</NetCurrentMobile>
13+
<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">$(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst)</NetCurrentMobile>
1514
<NetCurrentAll>$(TargetFrameworkOverride);$(NetCurrent);$(NetCurrentMobile);$(NetCurrentWindows);</NetCurrentAll>
1615
</PropertyGroup>
1716

0 commit comments

Comments
 (0)