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

Add the trailing .0 to all the windows things #20792

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Add the trailing .0 to all the windows things #20792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
<MacCatalystTargetFrameworkVersion>13.5</MacCatalystTargetFrameworkVersion>
<MacosTargetFrameworkVersion>10.14</MacosTargetFrameworkVersion>
<AndroidTargetFrameworkVersion>30.0</AndroidTargetFrameworkVersion>
<WindowsTargetFrameworkVersion>10.0.19041</WindowsTargetFrameworkVersion>
<Windows2TargetFrameworkVersion>10.0.20348</Windows2TargetFrameworkVersion>
<WindowsTargetFrameworkVersion>10.0.19041.0</WindowsTargetFrameworkVersion>
<Windows2TargetFrameworkVersion>10.0.20348.0</Windows2TargetFrameworkVersion>
<TizenTargetFrameworkVersion>6.5</TizenTargetFrameworkVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion eng/devices/windows.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;

const string defaultVersion = "10.0.19041";
const string defaultVersion = "10.0.19041.0";
const string dotnetVersion = "net8.0";

// required
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/device-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ stages:
parameters:
platform: windows
path: $(PROJECT_PATH)
apiVersion: 10.0.19041
apiVersion: 10.0.19041.0
windowsPackageId: $(PACKAGE_ID)
device: $(DEVICE) # For Windows this switches between packaged and unpackaged
provisionatorChannel: ${{ parameters.provisionatorChannel }}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/ui-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ stages:
- template: ui-tests-steps.yml
parameters:
platform: windows
version: "10.0.19041"
version: "10.0.19041.0"
device: windows10
path: ${{ project.winui }}
app: ${{ project.app }}
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/ControlGallery/src/WinUI/Compatibility.ControlGallery.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>$(_MauiDotNetTfm)-windows10.0.19041</TargetFramework>
<TargetFramework>$(_MauiDotNetTfm)-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
<RootNamespace>Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(_MauiDotNetTfm)-windows10.0.19041</TargetFramework>
<TargetFramework>$(_MauiDotNetTfm)-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
<RootNamespace>Microsoft.Maui.Controls.Compatibility.UAP.UnitTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Compatibility.UAP.UnitTests</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/UITests/UITest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public override IConfig GetTestConfig()
var appProjectFolder = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "..\\..\\..\\..\\..\\samples\\Controls.Sample.UITests");
var appProjectPath = Path.Combine(appProjectFolder, "Controls.Sample.UITests.csproj");
var windowsExe = "Controls.Sample.UITests.exe";
var windowsExePath = Path.Combine(appProjectFolder, $"bin\\{configuration}\\{frameworkVersion}-windows10.0.20348\\win10-x64\\{windowsExe}");
var windowsExePath = Path.Combine(appProjectFolder, $"bin\\{configuration}\\{frameworkVersion}-windows10.0.20348.0\\win10-x64\\{windowsExe}");

var appPath = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WINDOWS_APP_PATH"))
? windowsExePath
Expand Down