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

Update packages #3157

Merged
merged 8 commits into from
Jul 19, 2024
Merged

Update packages #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e0a20f
chore: update packages
dansiegel Jun 7, 2024
aefc02a
ci: bump uno-check
dansiegel Jun 7, 2024
285b5e3
ci: update Uno.Check
dansiegel Jul 4, 2024
a94900e
ci: bump uno check
dansiegel Jul 18, 2024
f04635b
ci: disable uno.check
dansiegel Jul 18, 2024
75462be
ci: bump uno.check for Jerome
dansiegel Jul 18, 2024
dbe230e
ci: try sdk installer update
dansiegel Jul 18, 2024
8263f60
ci: build workaround
dansiegel Jul 19, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/build_uno.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ on:

jobs:
build-prism-uno:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@dev/update-netsdkinstaller
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
windows-sdk-version: 18362
dotnet-version: 8.0.x
uno-check: true
dotnet-version: 8.0.300
install-workload: ios android macos maccatalyst wasm-tools
uno-check: false
uno-check-version: 1.25.1
uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
run-tests: false
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ jobs:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
windows-sdk-version: 18362
uno-check: true
dotnet-version: 8.0.300
install-workload: ios android macos maccatalyst wasm-tools
uno-check: false
uno-check-version: 1.24.0
uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
run-tests: false
code-sign: true
Expand Down
30 changes: 15 additions & 15 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
See https://aka.platform.uno/upgrade-uno-packages for more information.
-->
<ItemGroup Condition=" $(IsUnoProject) == 'true' ">
<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.1.5" />
<PackageVersion Include="Uno.WinUI.Markup" Version="5.1.5" />
<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.2.14" />
<PackageVersion Include="Uno.WinUI.Markup" Version="5.2.14" />
<PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.WinUI.Lottie" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.15" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.15" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.WinUI.DevServer" Version="$(UnoVersion)" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
Expand All @@ -42,15 +42,15 @@
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
<PackageVersion Include="Uno.Resizetizer" Version="1.3.0" />
<PackageVersion Include="Uno.Resizetizer" Version="1.4.10" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="4.0.0" />
<PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="4.0.0" />
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="4.1.24" />
<PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="4.1.24" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.1.1" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.1.7" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.7" />
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="4.0.0" />
<PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.24" />
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="4.1.24" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
Expand All @@ -63,10 +63,10 @@
<PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="xunit" Version="2.6.6" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageVersion Include="xunit" Version="2.8.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
</ItemGroup>
<ItemGroup Condition=" $(UseMaui) != 'true' ">
Expand All @@ -84,7 +84,7 @@
<ItemGroup>
<!-- Global Packages -->
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.139" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.56",
"MSBuild.Sdk.Extras": "3.0.44",
"Uno.Sdk": "5.1.69"
"Uno.Sdk": "5.2.161"
}
}
Loading