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

feat: Updating to Windows tfm 10.0.26100 #938

Merged
merged 2 commits into from
Sep 17, 2024
Merged

feat: Updating to Windows tfm 10.0.26100 #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e65c648
feat: Updating to Windows tfm 10.0.26100
nickrandolph Aug 29, 2024
926462b
chore: Bump .net version and .net9 references
nickrandolph Sep 16, 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
2 changes: 1 addition & 1 deletion .github/actions/sdk-update/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.300'
dotnet-version: '8.0.400'

- name: Setup GitVersion
uses: gittools/actions/gitversion/setup@v1.1.1
Expand Down
2 changes: 1 addition & 1 deletion build/.azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ variables:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
ValidationUnoCheckVersion: '1.25.1'
ValidationDotNetVersion: '8.0.304'
ValidationDotNetVersion: '8.0.400'

# https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9
# compatible version of the bootstrapper
Expand Down
2 changes: 1 addition & 1 deletion build/templates/dotnet-install-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
DotNetVersion: '8.0.100'
DotNetVersion: '8.0.400'

steps:

Expand Down
2 changes: 1 addition & 1 deletion build/templates/package-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ steps:
$dotnetVersion = $env:TargetDotNetVersion
if ($templateArgs -match 'net9.0')
{
$dotnetVersion = '9.0.100-preview.2.24157.14'
$dotnetVersion = '9.0.100-rc.1.24452.12'
}

echo "##vso[task.setvariable variable=DotNetVersion]$dotnetVersion"
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<!--#if (useWinAppSdk)-->
<configuration default="false" name="MyExtensionsApp.1 (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyExtensionsApp.1/MyExtensionsApp.1.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.19041.0" />
<option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.26100.0" />
<option name="LAUNCH_PROFILE_NAME" value="MyExtensionsApp.1 (WinAppSDK Unpackaged)" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
Expand Down
260 changes: 130 additions & 130 deletions src/Uno.Templates/content/unoapp/.template.config/template.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...lates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!--#endif-->
<!--#if (useWinAppSdk)-->
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.19041</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.26100</TargetFrameworks>
<!--#endif-->
<TargetFrameworks>
$baseTargetFramework$;
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Uno.Sdk">
<PropertyGroup>
<TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.19041;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
<TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.26100;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
<UnoSingleProject>true</UnoSingleProject>
<OutputType>Library</OutputType>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
Expand Down
2 changes: 1 addition & 1 deletion tools/TemplateTfmSwitchGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
new Platform("platforms == android", "platforms != android", "android"),
new Platform("platforms == ios", "platforms != ios", "ios"),
new Platform("platforms == maccatalyst", "platforms != maccatalyst", "maccatalyst"),
new Platform("platforms == windows", "platforms != windows", "windows10.0.19041"),
new Platform("platforms == windows", "platforms != windows", "windows10.0.26100"),
new Platform("platforms == wasm", "platforms != wasm", "browserwasm"),
new Platform("platforms == desktop", "platforms != desktop", "desktop"),
new Platform("useUnitTests == true", "useUnitTests == false", null)
Expand Down
Loading