Skip to content

Commit

Permalink
chore: Update implicit references
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromelaban committed Nov 5, 2024
1 parent ba3a2ce commit dbbfe2c
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 13 deletions.
8 changes: 4 additions & 4 deletions build/ci/.azure-devops-project-template-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
artifactName: 'Nuget_Packages'

- template: templates/gitversion.yml

- template: templates/dotnet-mobile-install-windows.yml
- template: templates/uno-dev-feed.yml

- script: copy $(System.ArtifactsDirectory)\Nuget_Packages\vslatest\*.nupkg $(Build.SourcesDirectory)\src\PackageCache
displayName: Copy Artifacts to PackageCache
Expand Down Expand Up @@ -88,6 +88,7 @@ jobs:
xCodeRoot: ${{ parameters.xCodeRoot }}

- template: templates/dotnet-mobile-install-mac.yml
- template: templates/uno-dev-feed.yml

- powershell: cp $(System.ArtifactsDirectory)/Nuget_Packages/vslatest/*.nupkg $(Build.SourcesDirectory)/src/PackageCache
displayName: Copy Artifacts to PackageCache
Expand Down Expand Up @@ -126,11 +127,10 @@ jobs:
artifactName: 'Nuget_Packages'

- template: templates/gitversion.yml

- template: templates/dotnet-mobile-install-linux.yml

- template: templates/gitversion.yml

- template: templates/uno-dev-feed.yml

- script: cp $(System.ArtifactsDirectory)/Nuget_Packages/vslatest/*.nupkg $(Build.SourcesDirectory)/src/PackageCache
displayName: Copy Artifacts to PackageCache

Expand Down
7 changes: 7 additions & 0 deletions build/ci/templates/uno-dev-feed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
parameters:
nugetPackages: '$(Pipeline.Workspace)/.nuget/packages'

steps:

- pwsh: dotnet nuget add source https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/unoplatformdev/nuget/v3/index.json -n "uno-dev"
displayName: Add dev feed source
4 changes: 2 additions & 2 deletions doc/articles/features/working-with-xaml-hot-reload.md
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ Mobile targets are currently using a limited version of XAML Hot Reload and do n

## Hot Reload Indicator

Hot Reload displays a visual indicator to help you further monitor changes while developing. It displays new information every time Hot Reload is triggered. The indicator is enabled by default within the `EnableHotReload()` method which is located in the root `App.xaml.cs` file. This displays an overlay which hosts the visual indicator. If you wish to disable it, you simply have to provide the following boolean: `EnableHotReload(disableIndicator: true)`, removing the overlay from the view.
Hot Reload displays a visual indicator to help you further monitor changes while developing. It displays new information every time Hot Reload is triggered. The indicator is enabled by default within the `UseStudio()` method which is located in the root `App.xaml.cs` file. This displays an overlay which hosts the visual indicator. If you wish to disable it, you simply have to provide the following boolean: `EnableHotReload(disableIndicator: true)`, removing the overlay from the view.

<p align="center">
<img src="../Assets/features/hotreload/indicator.png" alt="A hot reload visual indicator" />
Expand Down Expand Up @@ -370,7 +370,7 @@ Here's a summary of what icons and statuses you can expect:
//... in the OnLaunched method

#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif
```

Expand Down
4 changes: 4 additions & 0 deletions doc/articles/migrating-from-previous-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ A few considerations to take into account:
- Moving to .NET 9 or upgrading .NET 9 projects now require the use of .NET 9 RC2 and Visual Studio 17.12 Preview 3.
- To migrate a project to .NET 9, [read the directions](xref:Uno.Development.MigratingFromNet8ToNet9) from our documentation.

### The EnableHotReload method is deprecated

When upgrading to Uno 5.5, in the `App.xaml.cs` file, the `EnableHotReload()` method is deprecated and must be replaced with `UseStudio()` instead.

## Uno Platform 5.4

Uno Platform 5.4 contains breaking changes for Uno.Extensions.
Expand Down
2 changes: 1 addition & 1 deletion doc/articles/migrating-to-uno-5.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Hot Reload support has changed in Uno Platform 5.0 and a new API invocation is n
//... in the OnLaunched method

#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif
```

Expand Down
3 changes: 3 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@

<!-- Workaround for https://github.com/dotnet/runtime/issues/103205 -->
<NoWarn>$(NoWarn);CS0436</NoWarn>

<!-- Required for studio -->
<NoWarn>$(NoWarn);UNO0008</NoWarn>

<!-- On CI, UWP source is generated in a job running on Windows (CRLF EOLs). -->
<!-- When the artifacts are downloaded in a job running on Linux, IDE0055 will complain (expecting LF EOLs) -->
Expand Down
2 changes: 1 addition & 1 deletion src/SolutionTemplate/5.1/uno51blank/uno51blank/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
MainWindow = new Window();

#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
MainWindow = builder.Window;

#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif

Host = await builder.NavigateAsync<Shell>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
{
MainWindow = new Window();
#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif


Expand Down
2 changes: 1 addition & 1 deletion src/SolutionTemplate/5.2/uno52blank/uno52blank/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
{
MainWindow = new Window();
#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
{
MainWindow = new Window();
#if DEBUG
MainWindow.EnableHotReload();
MainWindow.UseStudio();
#endif


Expand Down
4 changes: 4 additions & 0 deletions src/Uno.Sdk/Sdk/Sdk.props.buildschema.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,10 @@
"description": "Provides an explicit override for the version of Uno.Settings to use.",
"type": "nuget-version"
},
"UnoHotDesignVersion": {
"description": "Provides an explicit override for the version of Uno.HotDesign to use.",
"type": "nuget-version"
},
"MicrosoftLoggingVersion": {
"description": "Provides an explicit override for the version of Microsoft.Extensions.Logging to use.",
"type": "nuget-version"
Expand Down
1 change: 1 addition & 0 deletions src/Uno.Sdk/Services/PackageManifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public class Group
public const string Resizetizer = nameof(Resizetizer);
public const string SdkExtras = nameof(SdkExtras);
public const string Settings = nameof(Settings);
public const string HotDesign = nameof(HotDesign);
public const string SkiaSharp = nameof(SkiaSharp);
public const string SvgSkia = nameof(SvgSkia);
public const string WinAppSdk = nameof(WinAppSdk);
Expand Down
3 changes: 3 additions & 0 deletions src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ public sealed class ImplicitPackagesResolver_v0 : Task

public string? UnoSettingsVersion { get; set; }

public string? UnoHotDesignVersion { get; set; }

public string? MicrosoftLoggingVersion { get; set; }

public string? WinAppSdkVersion { get; set; }
Expand Down Expand Up @@ -246,6 +248,7 @@ private void SetupRuntimePackageManifestUpdates(PackageManifest manifest)
.UpdateManifest(PackageManifest.Group.Resizetizer, UnoResizetizerVersion)
.UpdateManifest(PackageManifest.Group.SdkExtras, UnoSdkExtrasVersion)
.UpdateManifest(PackageManifest.Group.Settings, UnoSettingsVersion)
.UpdateManifest(PackageManifest.Group.HotDesign, UnoHotDesignVersion)
.UpdateManifest(PackageManifest.Group.SkiaSharp, SkiaSharpVersion)
.UpdateManifest(PackageManifest.Group.SvgSkia, SvgSkiaVersion)
.UpdateManifest(PackageManifest.Group.WinAppSdk, WinAppSdkVersion)
Expand Down
7 changes: 7 additions & 0 deletions src/Uno.Sdk/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@
"Uno.Settings.DevServer"
]
},
{
"group": "hotdesign",
"version": "1.0.0-dev.3",
"packages": [
"Uno.UI.HotDesign"
]
},
{
"group": "SkiaSharp",
"version": "2.88.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<_UnoProjectSystemPackageReference Include="Uno.Resizetizer" ProjectSystem="true" PrivateAssets="all" />
<_UnoProjectSystemPackageReference Include="Uno.Sdk.Extras" ProjectSystem="true" PrivateAssets="all" />
<_UnoProjectSystemPackageReference Include="Uno.Settings.DevServer" ProjectSystem="true" PrivateAssets="all" />
<_UnoProjectSystemPackageReference Include="Uno.UI.HotDesign" ProjectSystem="true" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">
Expand Down
1 change: 1 addition & 0 deletions src/Uno.Sdk/targets/Uno.Implicit.Packages.targets
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
UnoResizetizerVersion="$(UnoResizetizerVersion)"
UnoSdkExtrasVersion="$(UnoSdkExtrasVersion)"
UnoSettingsVersion="$(UnoSettingsVersion)"
UnoHotDesignVersion="$(UnoHotDesignVersion)"
MicrosoftLoggingVersion="$(MicrosoftLoggingVersion)"
WinAppSdkVersion="$(WinAppSdkVersion)"
WinAppSdkBuildToolsVersion="$(WinAppSdkBuildToolsVersion)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ private static void UpdateApplicationCore(Type[] types)
#endif
else
{
var errorMsg = $"Unable to access Dispatcher/DispatcherQueue in order to invoke {nameof(ReloadWithUpdatedTypes)}. Make sure you have enabled hot-reload (Window.EnableHotReload()) in app startup. See https://aka.platform.uno/hot-reload";
var errorMsg = $"Unable to access Dispatcher/DispatcherQueue in order to invoke {nameof(ReloadWithUpdatedTypes)}. Make sure you have enabled hot-reload (Window.UseStudio()) in app startup. See https://aka.platform.uno/hot-reload";
hr?.ReportError(new InvalidOperationException(errorMsg));
if (_log.IsEnabled(LogLevel.Warning))
{
Expand Down
7 changes: 7 additions & 0 deletions src/Uno.UI.RemoteControl/HotReload/WindowExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Uno.UI.RemoteControl.HotReload;
using Microsoft.UI.Xaml;
using Uno.Diagnostics.UI;
using System.ComponentModel;

namespace Uno.UI;

Expand All @@ -14,6 +15,9 @@ public static class WindowExtensions
/// Enables the UI Update cycle of HotReload to be handled by Uno
/// </summary>
/// <param name="window">The window of the application where UI updates will be applied</param>
[Obsolete("Use the UseStudio() method instead", DiagnosticId = "UNO0008", UrlFormat = "https://aka.platform.uno/UNO0008")]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public static void EnableHotReload(this Window window)
=> ClientHotReloadProcessor.SetWindow(window, false);

Expand All @@ -22,6 +26,9 @@ public static void EnableHotReload(this Window window)
/// </summary>
/// <param name="window">The window of the application where UI updates will be applied</param>
/// <param name="disableIndicator">Request to not show the on-canvas indicator by default.</param>
[Obsolete("Use the UseStudio() method instead", DiagnosticId = "UNO0008", UrlFormat = "https://aka.platform.uno/UNO0008")]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public static void EnableHotReload(this Window window, bool disableIndicator)
=> ClientHotReloadProcessor.SetWindow(window, disableIndicator);

Expand Down

0 comments on commit dbbfe2c

Please sign in to comment.