Skip to content

Commit

Permalink
Improve and update the MRTCore apps (microsoft#47)
Browse files Browse the repository at this point in the history
* TF, TPMV, MTPV, MTPMV

* NuGet package updates

* Fixing build config for cs winui release

* Don't override the .NET 5 targeting packages anymore. The version we get with the latest .NET 5 is newer.

* Reverted the NuGet package upgrade. Dynamic Dependencies is not present in 8.0 or 8.0.1. Confirmed builds and runs for x86 adn x64, for both Debug and Release. Also, removed Any CPU from the winforms sample.

* Add ARM64 support (only build verified so far) in winui apps and winforms app.

* Temp commit.

* WPF done. Winforms fix.

* Addressed feedback.

* Forgot to bold the Note part.

* Addressed feedback.
  • Loading branch information
rohanp-msft authored Aug 13, 2021
1 parent 7677c7e commit 12c279f
Show file tree
Hide file tree
Showing 16 changed files with 891 additions and 859 deletions.
4 changes: 3 additions & 1 deletion Samples/ResourceManagement/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ products: windows

# Load resources using MRT Core

MRT Core is the modern resource loading library used in WinUI 3 and the Windows App SDK. These samples demonstrate how to use MRT Core to load resources from multiple resource files and how to select which version of a specific named resource to load.
MRT Core is the modern resource loading library used in WinUI 3 and the Windows App SDK. These samples demonstrate how to use MRT Core to load resources from multiple resource files and how to select which version of a specific named resource to load.

**Note**: The unpackaged sample apps reference an [experimental version](https://docs.microsoft.com/windows/apps/windows-app-sdk/experimental-channel) of the Windows App SDK. Unpackaged app deployment is not currently supported for use by apps in production environments.

## Building and running any of the samples

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.InteractiveExperiences" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.210505.3" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.210204.1" targetFramework="native" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.InteractiveExperiences" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.210714.1" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.210204.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x86">
<Configuration>Debug</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<Configuration>Release</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|arm64">
<Configuration>Debug</Configuration>
<Platform>arm64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|arm64">
<Configuration>Release</Configuration>
<Platform>arm64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
<DebuggerType>NativeOnly</DebuggerType>
<BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
</PropertyGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup>
<ProjectGuid>b9fbccf9-049a-4da7-90b5-ac5c7685ec71</ProjectGuid>
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
<EntryPointProjectUniqueName>..\winui_desktop_packaged_app_cpp\winui_desktop_packaged_app_cpp.vcxproj</EntryPointProjectUniqueName>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Images\SplashScreen.scale-200.png" />
<Content Include="Images\LockScreenLogo.scale-200.png" />
<Content Include="Images\Square150x150Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\StoreLogo.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\winui_desktop_packaged_app_cpp\winui_desktop_packaged_app_cpp.vcxproj">
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0-preview">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<SDKReference Include="Microsoft.VCLibs.Desktop, Version=14.0" />
<!-- Needed for ucrtbased.dll when running a debug build. -->
<SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x86">
<Configuration>Debug</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<Configuration>Release</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|arm64">
<Configuration>Debug</Configuration>
<Platform>arm64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|arm64">
<Configuration>Release</Configuration>
<Platform>arm64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
<DebuggerType>NativeOnly</DebuggerType>
<BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
</PropertyGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup>
<ProjectGuid>b9fbccf9-049a-4da7-90b5-ac5c7685ec71</ProjectGuid>
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
<EntryPointProjectUniqueName>..\winui_desktop_packaged_app_cpp\winui_desktop_packaged_app_cpp.vcxproj</EntryPointProjectUniqueName>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Images\SplashScreen.scale-200.png" />
<Content Include="Images\LockScreenLogo.scale-200.png" />
<Content Include="Images\Square150x150Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\StoreLogo.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\winui_desktop_packaged_app_cpp\winui_desktop_packaged_app_cpp.vcxproj">
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.1">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<SDKReference Include="Microsoft.VCLibs.Desktop, Version=14.0" />
<!-- Needed for ucrtbased.dll when running a debug build. -->
<SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,45 +1,57 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30323.103
MinimumVisualStudioVersion = 10.0.40219.1
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "winui_desktop_packaged_app_cpp (Package)", "winui_desktop_packaged_app_cpp (Package)\winui_desktop_packaged_app_cpp (Package).wapproj", "{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winui_desktop_packaged_app_cpp", "winui_desktop_packaged_app_cpp\winui_desktop_packaged_app_cpp.vcxproj", "{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x64.ActiveCfg = Debug|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x64.Build.0 = Debug|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x64.Deploy.0 = Debug|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x86.ActiveCfg = Debug|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x86.Build.0 = Debug|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x86.Deploy.0 = Debug|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x64.ActiveCfg = Release|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x64.Build.0 = Release|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x64.Deploy.0 = Release|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x86.ActiveCfg = Release|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x86.Build.0 = Release|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x86.Deploy.0 = Release|x86
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x64.ActiveCfg = Debug|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x64.Build.0 = Debug|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x86.ActiveCfg = Debug|Win32
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x86.Build.0 = Debug|Win32
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x64.ActiveCfg = Release|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x64.Build.0 = Release|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x86.ActiveCfg = Release|Win32
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {24163EF4-7876-46E0-B075-DD9417BD9ECF}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30323.103
MinimumVisualStudioVersion = 10.0.40219.1
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "winui_desktop_packaged_app_cpp (Package)", "winui_desktop_packaged_app_cpp (Package)\winui_desktop_packaged_app_cpp (Package).wapproj", "{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winui_desktop_packaged_app_cpp", "winui_desktop_packaged_app_cpp\winui_desktop_packaged_app_cpp.vcxproj", "{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|arm64 = Debug|arm64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|arm64 = Release|arm64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|arm64.ActiveCfg = Debug|arm64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|arm64.Build.0 = Debug|arm64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|arm64.Deploy.0 = Debug|arm64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x64.ActiveCfg = Debug|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x64.Build.0 = Debug|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x64.Deploy.0 = Debug|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x86.ActiveCfg = Debug|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x86.Build.0 = Debug|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Debug|x86.Deploy.0 = Debug|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|arm64.ActiveCfg = Release|arm64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|arm64.Build.0 = Release|arm64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|arm64.Deploy.0 = Release|arm64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x64.ActiveCfg = Release|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x64.Build.0 = Release|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x64.Deploy.0 = Release|x64
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x86.ActiveCfg = Release|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x86.Build.0 = Release|x86
{B9FBCCF9-049A-4DA7-90B5-AC5C7685EC71}.Release|x86.Deploy.0 = Release|x86
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|arm64.ActiveCfg = Debug|arm64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|arm64.Build.0 = Debug|arm64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x64.ActiveCfg = Debug|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x64.Build.0 = Debug|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x86.ActiveCfg = Debug|Win32
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Debug|x86.Build.0 = Debug|Win32
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|arm64.ActiveCfg = Release|arm64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|arm64.Build.0 = Release|arm64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x64.ActiveCfg = Release|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x64.Build.0 = Release|x64
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x86.ActiveCfg = Release|Win32
{3A97D881-ABA4-4265-BD4C-AC9F33A8A4DD}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {24163EF4-7876-46E0-B075-DD9417BD9ECF}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.InteractiveExperiences" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" targetFramework="native" />
<package id="Microsoft.VCRTForwarders.140" version="1.0.7" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.210505.3" targetFramework="native" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.ProjectReunion" version="0.8.1" targetFramework="native" />
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.1" targetFramework="native" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.1" targetFramework="native" />
<package id="Microsoft.ProjectReunion.InteractiveExperiences" version="0.8.1" targetFramework="native" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.1" targetFramework="native" />
<package id="Microsoft.VCRTForwarders.140" version="1.0.7" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.210714.1" targetFramework="native" />
</packages>
Loading

0 comments on commit 12c279f

Please sign in to comment.