Skip to content

Commit 80e388e

Browse files
committed
Reenabled uitests
1 parent 36e9593 commit 80e388e

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

UITests/UITests.App.Package/UITests.App.Package.wapproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
33
<VisualStudioVersion>15.0</VisualStudioVersion>
44
</PropertyGroup>
@@ -32,14 +32,14 @@
3232
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
3333
<PathToXAMLWinRTImplementations>UITests.App\</PathToXAMLWinRTImplementations>
3434
<AppxBundlePlatforms>$(Platform)</AppxBundlePlatforms>
35-
<AssetTargetFallback>net5.0-windows10.0.19041;$(AssetTargetFallback)</AssetTargetFallback>
3635
</PropertyGroup>
3736
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
3837
<PropertyGroup>
3938
<ProjectGuid>02215818-3d33-439e-843e-f1ec53d5a1bd</ProjectGuid>
4039
<TargetPlatformRevision>19041</TargetPlatformRevision>
4140
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
4241
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
42+
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
4343
<DefaultLanguage>en-US</DefaultLanguage>
4444
<AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
4545
<EntryPointProjectUniqueName>..\UITests.App\UITests.App.csproj</EntryPointProjectUniqueName>

UITests/UITests.App/UITests.App.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
@@ -35,13 +35,14 @@
3535
<ItemGroup>
3636
<PackageReference Include="Microsoft.Internal.MUXAppTestHelpers.WinUI">
3737
<Version>3.0.0-zmain.210407.3-CI</Version>
38+
<ExcludeAssets>runtime</ExcludeAssets>
3839
</PackageReference>
39-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.6" />
40+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.0" />
4041
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
41-
<PackageReference Include="Grpc" Version="2.36.4" />
42-
<PackageReference Include="Google.Protobuf" Version="3.15.7" />
43-
<PackageReference Include="Grpc.Tools" Version="2.36.4" PrivateAssets="All" />
44-
<PackageReference Include="Grpc.AspNetCore" Version="2.36.0" />
42+
<PackageReference Include="Grpc" Version="2.38.1" />
43+
<PackageReference Include="Google.Protobuf" Version="3.17.3" />
44+
<PackageReference Include="Grpc.Tools" Version="2.38.1" PrivateAssets="All" />
45+
<PackageReference Include="Grpc.AspNetCore" Version="2.38.0" />
4546
</ItemGroup>
4647
<ItemGroup>
4748
<ProjectReference Include="..\..\CommunityToolkit.HighPerformance\CommunityToolkit.HighPerformance.csproj">

build/Windows.Toolkit.Uwp.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<ItemGroup Condition="'$(IsWinUIProject)' == 'true' or '$(IsDesignProject)' == 'true' or '$(IsSampleProject)' == 'true' or '$(IsTestProject)' == 'true'">
1313
<PackageReference Include="Microsoft.ProjectReunion" Version="$(MicrosoftProjectReunionVersion)" />
14-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.$(TargetPlatformRevision).17" />
15-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.$(TargetPlatformRevision).17" />
14+
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.$(TargetPlatformRevision).18" />
15+
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.$(TargetPlatformRevision).18" />
1616
</ItemGroup>
1717
</When>
1818
</Choose>

build/build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ Task("MSTestUITest")
343343
Task("Default")
344344
.IsDependentOn("Build")
345345
//.IsDependentOn("Test")
346-
//.IsDependentOn("UITest")
346+
.IsDependentOn("UITest")
347347
.IsDependentOn("Package");
348348

349349
Task("UpdateHeaders")

0 commit comments

Comments
 (0)