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.

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

Move user-facing strings to resource files #1109

Merged
merged 30 commits into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
356b735
satellite dll project
j0shuams Jan 25, 2022
248be2d
Merge branch 'master' into jlarkin/localize-3
j0shuams Jan 26, 2022
a06e0df
checkout old work on winrtruntime
j0shuams Jan 26, 2022
c508672
rename, use resource class
j0shuams Jan 26, 2022
498f051
update authoring diagnostics
j0shuams Jan 26, 2022
37fb348
updates
j0shuams Jan 26, 2022
76923e0
references, project property
j0shuams Feb 15, 2022
36af266
Merge branch 'master' into jlarkin/localize-3
j0shuams Feb 15, 2022
6328418
simplify"
j0shuams Feb 16, 2022
b0c8456
clean up
j0shuams Feb 16, 2022
6a6ff5f
del
j0shuams Feb 16, 2022
2a833e9
arm64 build config
j0shuams Feb 16, 2022
ca1bed4
build setting
j0shuams Feb 17, 2022
d5f7d31
nuget, build config tweak
j0shuams Feb 17, 2022
da9c5f0
arm
j0shuams Feb 17, 2022
1c4549d
'build.cmd'
j0shuams Feb 18, 2022
96aa310
str suffix
j0shuams Feb 23, 2022
a85fe59
Merge branch 'master' into jlarkin/localize-3
j0shuams Feb 23, 2022
598b927
tab
j0shuams Feb 23, 2022
455fafe
Merge branch 'master' into jlarkin/localize-3
j0shuams Feb 23, 2022
409d81c
Update localization branch (#1135)
j0shuams Mar 14, 2022
bcfc9ba
Merge branch 'master' into jlarkin/localize-3
j0shuams Mar 14, 2022
800b20b
cleanup
j0shuams Mar 14, 2022
f3e6328
en-us
j0shuams Mar 15, 2022
f02783b
Merge branch 'master' into jlarkin/localize-3
j0shuams Mar 15, 2022
d7b5b9b
comment
j0shuams Mar 15, 2022
a6b5a4c
feedback
j0shuams Mar 15, 2022
b1cacfa
more feedback
j0shuams Mar 18, 2022
f8380a8
Merge branch 'master' into jlarkin/localize-3
j0shuams Mar 18, 2022
6dc24d5
Merge branch 'master' into jlarkin/localize-3
j0shuams Mar 19, 2022
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: 2 additions & 0 deletions nuget/Microsoft.Windows.CsWinRT.Authoring.Transitive.targets
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<HostingAssets Include="$(MSBuildThisFileDirectory)..\build\native\WinRT.Host.runtimeconfig.json"/>
<!-- Get the proper WinRT.Host.dll -->
<HostingAssets Include="$(MSBuildThisFileDirectory)..\runtimes\win-$(_NormalizedPlatform)\native\WinRT.Host.dll" />
<!-- Get the proper WinRT.Host.ErrorStrings.dll -->
<HostingAssets Include="$(MSBuildThisFileDirectory)..\runtimes\win-$(_NormalizedPlatform)\native\WinRT.Host.ErrorStrings.dll" />
</ItemGroup>

<!-- Add the WinMD file as a reference of the native app so a projection gets made -->
Expand Down
22 changes: 22 additions & 0 deletions nuget/Microsoft.Windows.CsWinRT.Authoring.targets
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>

<None Condition="Exists('$(CsWinRTPath)runtimes\win-$(CsWinRTAuthoring_Platform)\native\WinRT.Host.ErrorStrings.dll')"
Include="$(CsWinRTPath)runtimes\win-$(CsWinRTAuthoring_Platform)\native\WinRT.Host.ErrorStrings.dll">
<TargetPath>WinRT.Host.ErrorStrings.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>

</ItemGroup>

<!-- Add the RuntimeConfig to output of project reference consumers -->
Expand Down Expand Up @@ -292,21 +298,37 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<Pack>true</Pack>
<PackagePath>runtimes\win-x64\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x64\native\WinRT.Host.ErrorStrings.dll')" Include="$(CsWinRTPath)runtimes\win-x64\native\WinRT.Host.ErrorStrings.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-x64\native</PackagePath>
</Content>
<!-- x86 -->
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x86\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-x86\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-x86\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x86\native\WinRT.Host.ErrorStrings.dll')" Include="$(CsWinRTPath)runtimes\win-x86\native\WinRT.Host.ErrorStrings.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-x86\native</PackagePath>
</Content>
<!-- arm -->
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-arm\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm\native\WinRT.Host.ErrorStrings.dll')" Include="$(CsWinRTPath)runtimes\win-arm\native\WinRT.Host.ErrorStrings.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm\native</PackagePath>
</Content>
<!-- arm64 -->
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm64\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-arm64\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm64\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm64\native\WinRT.Host.ErrorStrings.dll')" Include="$(CsWinRTPath)runtimes\win-arm64\native\WinRT.Host.ErrorStrings.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm64\native</PackagePath>
</Content>
</ItemGroup>

</Target>
Expand Down
4 changes: 4 additions & 0 deletions nuget/Microsoft.Windows.CsWinRT.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<file src="$winrt_host_x86$" target ="runtimes\win-x86\native"/>
<file src="$winrt_host_arm$" target ="runtimes\win-arm\native"/>
<file src="$winrt_host_arm64$" target ="runtimes\win-arm64\native"/>
<file src="$winrt_host_resource_x64$" target ="runtimes\win-x64\native"/>
<file src="$winrt_host_resource_x86$" target ="runtimes\win-x86\native"/>
<file src="$winrt_host_resource_arm$" target ="runtimes\win-arm\native"/>
<file src="$winrt_host_resource_arm64$" target ="runtimes\win-arm64\native"/>
<file src="$winrt_shim$" target ="lib\net5.0\"/>

<!-- Add the WinRT.Runtime sources to the pkg for embedded scenarios -->
Expand Down
121 changes: 121 additions & 0 deletions src/Authoring/WinRT.Host.ErrorStrings/WinRT.Host.ErrorStrings.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (United States) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// String Table
//

STRINGTABLE
BEGIN
InvalidArgFailure "One of the specified arguments for the operation is invalid."
CoreHostLibLoadFailure "There was a failure loading a dependent library."
CoreHostLibMissingFailure "One of the dependent libraries is missing."
CoreHostEntryPointFailure
"One of the dependent libraries is missing a required entry point."
CoreHostCurHostFindFailure
"Could not deduce installation location from current module."
CoreClrResolveFailure "The coreclr library could not be found."
END

STRINGTABLE
BEGIN
CoreClrBindFailure "The loaded coreclr library doesn't have one of the required entry points."
CoreClrInitFailure "The call to coreclr_initialize failed."
CoreClrExeFailure "The call to coreclr_execute_assembly failed."
ResolverInitFailure "Initialization of the hostpolicy dependency resolver failed."
ResolverResolveFailure "Resolution of dependencies in hostpolicy failed."
LibHostCurExeFindFailure
"Failure to determine the location of the current executable."
LibHostInitFailure "Initialization of the hostpolicy library failed."
LibHostSdkFindFailure "Failure to find the requested SDK. This happens in the hostfxr when an SDK(also called CLI) command is used with dotnet. In this case the hosting layer tries to find an installed. NET SDK to run the command on. The search is based on deduced install locationand on the requested version from potential global. json file. If either no matching SDK version can be found, or that version exists, but it's missing the dotnet. dll file, this error code is returned."
LibHostInvalidArgs "Arguments to hostpolicy are invalid."
InvalidConfigFile "The .runtimeconfig.json file is invalid."
AppArgNotRunnable "The command line for dotnet.exe doesn't contain the path to the application."
AppHostExeNotBoundFailure
"Apphost failed to determine which application to run."
FrameworkMissingFailure "It was not possible to find a compatible framework version."
HostApiFailed "The hostpolicy could not calculate the NATIVE_DLL_SEARCH_DIRECTORIES."
HostApiBufferTooSmall "The buffer specified to an API is not big enough to fit the requested value."
LibHostUnknownCommand "The corehost_main_with_output_buffer is called with unsupported host command."
END

STRINGTABLE
BEGIN
LibHostAppRootFindFailure "The imprinted application path doesn't exist."
SdkResolverResolveFailure
"hostfxr_resolve_sdk2 failed to find matching SDK."
FrameworkCompatFailure "The .runtimeconfig.json contains two incompatible framework references."
FrameworkCompatRetry "A previously processed framework reference was reprocessed."
BundleExtractionFailure "Error extracting single-file apphost bundle."
BundleExtractionIOError "Error reading or writing files during single-file apphost bundle extraction."
LibHostDuplicateProperty
"The .runtimeconfig.json contains a runtime property which is also produced by the hosting layer."
HostApiUnsupportedVersion
"Feature which requires certain version of the hosting layer binaries was used on a version which doesn't support it."
HostInvalidState "The current state is incompatible with the requested operation."
HostPropertyNotFound "A property requested by hostfxr_get_runtime_property_value doesn't exist."
CoreHostIncompatibleConfig
"The component being initialized requires framework which is not available."
HostApiUnsupportedScenario
"hostfxr doesn't currently support requesting the given delegate type using the given context."
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Loading