diff --git a/WindowsAppRuntime.sln b/WindowsAppRuntime.sln index bbfe1d75ab..8945f64557 100644 --- a/WindowsAppRuntime.sln +++ b/WindowsAppRuntime.sln @@ -420,6 +420,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VersionInfoTests", "test\Ve {5E2CC9D5-7C05-41D9-9DB5-EC5DF64BA1DC} = {5E2CC9D5-7C05-41D9-9DB5-EC5DF64BA1DC} {9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE} EndProjectSection +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kozani", "Kozani", "{84F66485-4391-41C7-89CB-D5006EDF1383}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KozaniAppGraph", "KozaniAppGraph", "{AC000276-4BCF-4E2B-B9C2-1B2716E61CC1}" @@ -592,6 +593,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakeMSIXTests", "test\Kozan EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FrameworkUdk.PackageReference", "eng\PackageReference\FrameworkUdk\Microsoft.FrameworkUdk.PackageReference.csproj", "{FD0CC14A-ED4B-4936-B68B-F31E58372E32}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KozaniManagerRuntime", "KozaniManagerRuntime", "{49CF5AB7-304F-4C78-A098-A77B2931F64E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KozaniManagerRuntimeTests", "KozaniManagerRuntimeTests", "{357BE857-3E5D-475A-8A03-583F44E6513B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KozaniManagerRuntimeTests", "test\Kozani\KozaniManagerRuntimeTests\KozaniManagerRuntimeTests.vcxproj", "{4B4667B2-94DB-4A19-8270-0FDB1676C27B}" + ProjectSection(ProjectDependencies) = postProject + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5} = {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5} + {B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KozaniManagerRuntime", "dev\Kozani\KozaniManagerRuntime\KozaniManagerRuntime.vcxproj", "{400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}" + ProjectSection(ProjectDependencies) = postProject + {5C0E77FA-B6F4-4B3F-AAE5-AB85CF97816F} = {5C0E77FA-B6F4-4B3F-AAE5-AB85CF97816F} + {B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1} + {CFC67AC3-3DC3-4981-A9BB-BC5ED06542D4} = {CFC67AC3-3DC3-4981-A9BB-BC5ED06542D4} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1740,22 +1758,6 @@ Global {442FB943-1197-48FE-B3B6-8C1BCA1E81E4}.Release|x64.Build.0 = Release|x64 {442FB943-1197-48FE-B3B6-8C1BCA1E81E4}.Release|x86.ActiveCfg = Release|Win32 {442FB943-1197-48FE-B3B6-8C1BCA1E81E4}.Release|x86.Build.0 = Release|Win32 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|ARM64.Build.0 = Debug|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x64.ActiveCfg = Debug|x64 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x64.Build.0 = Debug|x64 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x86.Build.0 = Debug|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|Any CPU.Build.0 = Release|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|ARM64.ActiveCfg = Release|x64 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|ARM64.Build.0 = Release|x64 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x64.ActiveCfg = Release|x64 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x64.Build.0 = Release|x64 - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x86.ActiveCfg = Release|Any CPU - {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x86.Build.0 = Release|Any CPU {77D1D0EB-E4CA-4043-8CD1-72D30E19B65B}.Debug|Any CPU.ActiveCfg = Debug|x64 {77D1D0EB-E4CA-4043-8CD1-72D30E19B65B}.Debug|Any CPU.Build.0 = Debug|x64 {77D1D0EB-E4CA-4043-8CD1-72D30E19B65B}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -2108,6 +2110,54 @@ Global {91FA558E-ABE3-4F36-B611-927AC041F5D2}.Release|x64.Build.0 = Release|x64 {91FA558E-ABE3-4F36-B611-927AC041F5D2}.Release|x86.ActiveCfg = Release|Win32 {91FA558E-ABE3-4F36-B611-927AC041F5D2}.Release|x86.Build.0 = Release|Win32 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|ARM64.Build.0 = Debug|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x64.ActiveCfg = Debug|x64 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x64.Build.0 = Debug|x64 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x86.ActiveCfg = Debug|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Debug|x86.Build.0 = Debug|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|Any CPU.Build.0 = Release|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|ARM64.ActiveCfg = Release|x64 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|ARM64.Build.0 = Release|x64 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x64.ActiveCfg = Release|x64 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x64.Build.0 = Release|x64 + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x86.ActiveCfg = Release|Any CPU + {FD0CC14A-ED4B-4936-B68B-F31E58372E32}.Release|x86.Build.0 = Release|Any CPU + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|Any CPU.ActiveCfg = Debug|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|Any CPU.Build.0 = Debug|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|ARM64.Build.0 = Debug|ARM64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|x64.ActiveCfg = Debug|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|x64.Build.0 = Debug|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|x86.ActiveCfg = Debug|Win32 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Debug|x86.Build.0 = Debug|Win32 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|Any CPU.ActiveCfg = Release|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|Any CPU.Build.0 = Release|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|ARM64.ActiveCfg = Release|ARM64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|ARM64.Build.0 = Release|ARM64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|x64.ActiveCfg = Release|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|x64.Build.0 = Release|x64 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|x86.ActiveCfg = Release|Win32 + {4B4667B2-94DB-4A19-8270-0FDB1676C27B}.Release|x86.Build.0 = Release|Win32 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|Any CPU.Build.0 = Debug|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|ARM64.Build.0 = Debug|ARM64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|x64.ActiveCfg = Debug|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|x64.Build.0 = Debug|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|x86.ActiveCfg = Debug|Win32 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Debug|x86.Build.0 = Debug|Win32 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|Any CPU.ActiveCfg = Release|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|Any CPU.Build.0 = Release|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|ARM64.ActiveCfg = Release|ARM64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|ARM64.Build.0 = Release|ARM64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|x64.ActiveCfg = Release|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|x64.Build.0 = Release|x64 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|x86.ActiveCfg = Release|Win32 + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2288,6 +2338,10 @@ Global {183603F5-540B-4286-A5F9-40CF20F62660} = {73A8E7CE-EBB2-4524-ADE1-4C2BF2057FCC} {B78ACB5B-3256-486E-B6D0-510C7DA7FBB0} = {9164C50F-E9CA-41BD-BCA9-5F30845FA257} {91FA558E-ABE3-4F36-B611-927AC041F5D2} = {B78ACB5B-3256-486E-B6D0-510C7DA7FBB0} + {49CF5AB7-304F-4C78-A098-A77B2931F64E} = {84F66485-4391-41C7-89CB-D5006EDF1383} + {357BE857-3E5D-475A-8A03-583F44E6513B} = {9164C50F-E9CA-41BD-BCA9-5F30845FA257} + {4B4667B2-94DB-4A19-8270-0FDB1676C27B} = {357BE857-3E5D-475A-8A03-583F44E6513B} + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5} = {49CF5AB7-304F-4C78-A098-A77B2931F64E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77} diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.cpp b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.cpp new file mode 100644 index 0000000000..9bc761f58d --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.cpp @@ -0,0 +1,6 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#include "pch.h" + +#include "KozaniManagerRuntime.h" diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.def b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.def new file mode 100644 index 0000000000..57b94d2ca7 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.def @@ -0,0 +1,6 @@ +; Copyright (c) Microsoft Corporation. All rights reserved. +; Licensed under the MIT License. See LICENSE in the project root for license information. + +EXPORTS + DllCanUnloadNow = WINRT_CanUnloadNow PRIVATE + DllGetActivationFactory = WINRT_GetActivationFactory PRIVATE diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.h b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.h new file mode 100644 index 0000000000..84a55d0aa1 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.h @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#if !defined(KOZANIMANAGERRUNTIME_H) +#define KOZANIMANAGERRUNTIME_H + +#include + +#if defined(__cplusplus) +#define KOZANIMANAGERRUNTIME_NOEXCEPT noexcept +#else +#define KOZANIMANAGERRUNTIME_NOEXCEPT +#endif // defined(__cplusplus) + +//TODO Flat-C API + +// C++ friendly APIs +#if defined(__cplusplus) + +//TODO C++ API + +#endif // defined(__cplusplus) + +#endif // KOZANIMANAGERRUNTIME_H diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.idl b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.idl new file mode 100644 index 0000000000..56fa13e638 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.idl @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +namespace Microsoft.Kozani.ManagerRuntime +{ + [contractversion(1)] + apicontract ManagerRuntimeContract{}; + + [contract(ManagerRuntimeContract, 1)] + runtimeclass ManagerRuntimeManager + { + /// Get a ManagerRuntime manager for the caller's context. + static ManagerRuntimeManager Open(); + + void TODO_ReplaceMeWithRealContent(); + }; +} diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.rc b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.rc new file mode 100644 index 0000000000..7380bc027a --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.rc @@ -0,0 +1,6 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#include +#define VERSIONINFO_FILENAME "KozaniManagerRuntime.dll" +#include "eng\common\VersionInfo\AssemblyInfo.ver" diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.vcxproj b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.vcxproj new file mode 100644 index 0000000000..14683d372a --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.vcxproj @@ -0,0 +1,221 @@ + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM64 + + + Release + ARM64 + + + + 16.0 + Win32Proj + {400ED5EC-4530-4ADB-8DCE-9D1E6708A1F5} + KozaniManagerRuntime + 10.0 + true + true + true + true + 9 + + + KozaniManagerRuntime + DynamicLibrary + v143 + Unicode + + + true + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_DLL;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)\dev\common;$(IntDir);%(AdditionalIncludeDirectories) + Use + pch.h + KOZANIMANAGERRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + + + Windows + false + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) + Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs) + + + $(RepoRoot)\dev\common;%(AdditionalIncludeDirectories) + + + + + _DEBUG;%(PreprocessorDefinitions) + + + + + NDEBUG;%(PreprocessorDefinitions) + + + + + WIN32;%(PreprocessorDefinitions) + + + + + KozaniManagerRuntime.def + + + + + KozaniManagerRuntime.def + + + + + KozaniManagerRuntime.def + + + + + KozaniManagerRuntime.def + + + + + KozaniManagerRuntime.def + + + + + KozaniManagerRuntime.def + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + $(RepoRoot)\dev\Common;$(RepoRoot);%(AdditionalIncludeDirectories) + + + + + + + + + + + + + <_MdMergeParameters>-v @(CppWinRTMdMergeMetadataDirectories->'-metadata_dir "%(RelativeDir)."', ' ') + <_MdMergeParameters>$(_MdMergeParameters) -o "$(OutDir)StrippedWinMD" @(CppWinRTMdMergeInputs->'-i "%(Identity)"', ' ') -partial -n:9 -createPublicMetadata -transformExperimental:transform + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.vcxproj.filters b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.vcxproj.filters new file mode 100644 index 0000000000..dd5ccec5f3 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntime.vcxproj.filters @@ -0,0 +1,74 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + + + Source Files + + + + + + Resource Files + + + + + + diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeActivity.cpp b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeActivity.cpp new file mode 100644 index 0000000000..c771e74c18 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeActivity.cpp @@ -0,0 +1,8 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#pragma once + +#include "pch.h" + +#include "KozaniManagerRuntimeActivity.h" diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeActivity.h b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeActivity.h new file mode 100644 index 0000000000..b200334a56 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeActivity.h @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#pragma once + +#include "KozaniManagerRuntimeTraceLogging.h" + +namespace Microsoft::Kozani::KozaniManagerRuntime::Activity +{ +} diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeTracelogging.cpp b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeTracelogging.cpp new file mode 100644 index 0000000000..a50fa0c2bb --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeTracelogging.cpp @@ -0,0 +1,6 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#pragma once + +#include "pch.h" diff --git a/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeTracelogging.h b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeTracelogging.h new file mode 100644 index 0000000000..d91721944c --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/KozaniManagerRuntimeTracelogging.h @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#pragma once + +#include "pch.h" + +#include "Microsoft.TraceLogging.h" + +bool __stdcall wilResultLoggingThreadCallback(const wil::FailureInfo& failure) noexcept; + +GUID& GetLifetimeActivityId() noexcept; + +class Microsoft_Kozani_ManagerRuntime_TraceLogger final : public wil::TraceLoggingProvider +{ + IMPLEMENT_TRACELOGGING_CLASS( + Microsoft_Kozani_ManagerRuntime_TraceLogger, + "Microsoft.Kozani.ManagerRuntime", + // 24ccf6d3-5878-4a9f-82e3-fadbac2515e7 + (0x24ccf6d3, 0x5878, 0x4a9f, 0x82, 0xe3, 0xfa, 0xdb, 0xac, 0x25, 0x15, 0xe7)); + +public: +}; + +#define _MICROSOFT_KOZANI_MANAGERRUNTIME_WRITE_FAILURE_INFO \ + TraceLoggingValue(static_cast(failure.type), "Type"),\ + TraceLoggingValue(failure.hr, "HResult"),\ + TraceLoggingValue(failure.pszFile, "File"),\ + TraceLoggingValue(failure.uLineNumber,"Line"),\ + TraceLoggingValue(failure.pszModule, "Module"),\ + TraceLoggingValue(failure.pszMessage,"Message") + +// In the future, if the project includes multiple modules and threads, we could log that data as well from FailureInfo +// In the future and on need basis, we could log call stack as well +#define KozaniManagerRuntime_WriteEventWithActivity(_eventname_,_activityId_,...) \ + TraceLoggingWriteActivity(\ + Microsoft_Kozani_ManagerRuntime_TraceLogger::Provider(),\ + _eventname_,\ + _activityId_,\ + nullptr,\ + _MICROSOFT_KOZANI_MANAGERRUNTIME_WRITE_FAILURE_INFO,\ + __VA_ARGS__) diff --git a/dev/Kozani/KozaniManagerRuntime/M.K.MR.ManagerRuntimeManager.cpp b/dev/Kozani/KozaniManagerRuntime/M.K.MR.ManagerRuntimeManager.cpp new file mode 100644 index 0000000000..5ac6e01514 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/M.K.MR.ManagerRuntimeManager.cpp @@ -0,0 +1,20 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +#include "pch.h" + +#include "M.K.MR.ManagerRuntimeManager.h" + +#include "Microsoft.Kozani.ManagerRuntime.ManagerRuntimeManager.g.cpp" + +namespace winrt::Microsoft::Kozani::ManagerRuntime::implementation +{ + winrt::Microsoft::Kozani::ManagerRuntime::ManagerRuntimeManager ManagerRuntimeManager::Open() + { + throw hresult_not_implemented(); + } + void ManagerRuntimeManager::TODO_ReplaceMeWithRealContent() + { + throw hresult_not_implemented(); + } +} diff --git a/dev/Kozani/KozaniManagerRuntime/M.K.MR.ManagerRuntimeManager.h b/dev/Kozani/KozaniManagerRuntime/M.K.MR.ManagerRuntimeManager.h new file mode 100644 index 0000000000..651a4d3d7f --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/M.K.MR.ManagerRuntimeManager.h @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +#pragma once + +#include "Microsoft.Kozani.ManagerRuntime.ManagerRuntimeManager.g.h" + +namespace winrt::Microsoft::Kozani::ManagerRuntime::implementation +{ + struct ManagerRuntimeManager : ManagerRuntimeManagerT + { + ManagerRuntimeManager() = default; + + static winrt::Microsoft::Kozani::ManagerRuntime::ManagerRuntimeManager Open(); + void TODO_ReplaceMeWithRealContent(); + }; +} +namespace winrt::Microsoft::Kozani::ManagerRuntime::factory_implementation +{ + struct ManagerRuntimeManager : ManagerRuntimeManagerT + { + }; +} diff --git a/dev/Kozani/KozaniManagerRuntime/dllmain.cpp b/dev/Kozani/KozaniManagerRuntime/dllmain.cpp new file mode 100644 index 0000000000..2da5b862d4 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/dllmain.cpp @@ -0,0 +1,27 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#include "pch.h" + +// Including this file once per binary will automatically opt WIL error handling macros into calling RoOriginateError when they +// begin logging a new error. This greatly improves the debuggability of errors that propagate before a failfast. +#include + +BOOL APIENTRY DllMain(HMODULE hmodule, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hmodule); + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + + // Give WIL a crack at DLLMain processing + // See DLLMain() in wil/result_macros.h for why + wil::DLLMain(hmodule, reason, reserved); + + return TRUE; +} diff --git a/dev/Kozani/KozaniManagerRuntime/framework.h b/dev/Kozani/KozaniManagerRuntime/framework.h new file mode 100644 index 0000000000..7f4f1a8857 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/framework.h @@ -0,0 +1,30 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#pragma once + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include + +#include "kozanimanagerruntime.h" diff --git a/dev/Kozani/KozaniManagerRuntime/packages.config b/dev/Kozani/KozaniManagerRuntime/packages.config new file mode 100644 index 0000000000..d874501876 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/packages.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/dev/Kozani/KozaniManagerRuntime/pch.cpp b/dev/Kozani/KozaniManagerRuntime/pch.cpp new file mode 100644 index 0000000000..9cee44c56d --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/pch.cpp @@ -0,0 +1,4 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#include "pch.h" diff --git a/dev/Kozani/KozaniManagerRuntime/pch.h b/dev/Kozani/KozaniManagerRuntime/pch.h new file mode 100644 index 0000000000..be289b02c9 --- /dev/null +++ b/dev/Kozani/KozaniManagerRuntime/pch.h @@ -0,0 +1,20 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +// pch.h: This is a precompiled header file. +// Files listed below are compiled only once, improving build performance for future builds. +// This also affects IntelliSense performance, including code completion and many code browsing features. +// However, files listed here are ALL re-compiled if any one of them is updated between builds. +// Do not add files here that you will be updating frequently as this negates the performance advantage. + +#ifndef PCH_H +#define PCH_H + +#include + +// add headers that you want to pre-compile here +#include "framework.h" +#include "KozaniManagerRuntimeActivity.h" +#include "KozaniManagerRuntimeTraceLogging.h" + +#endif //PCH_H diff --git a/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.cpp b/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.cpp new file mode 100644 index 0000000000..3a1e9c4181 --- /dev/null +++ b/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.cpp @@ -0,0 +1,35 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#include "pch.h" + +namespace TB = ::Test::Bootstrap; +namespace TP = ::Test::Packages; + +namespace Test::KozaniManagerRuntimeTests +{ + class KozaniManagerRuntimeTests + { + public: + BEGIN_TEST_CLASS(KozaniManagerRuntimeTests) + TEST_CLASS_PROPERTY(L"ThreadingModel", L"MTA") + END_TEST_CLASS() + + TEST_CLASS_SETUP(ClassSetup) + { + ::TB::Setup(); + return true; + } + + TEST_CLASS_CLEANUP(ClassCleanup) + { + ::TB::Cleanup(); + return true; + } + + // TODO Replace this with your own tests + TEST_METHOD(JustDoIt) + { + } + }; +} diff --git a/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.vcxproj b/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.vcxproj new file mode 100644 index 0000000000..1292e1e792 --- /dev/null +++ b/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.vcxproj @@ -0,0 +1,155 @@ + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM64 + + + Release + ARM64 + + + + 16.0 + {4b4667b2-94db-4a19-8270-0fdb1676c27b} + Win32Proj + KozaniManagerRuntimeTests + 10.0 + NativeUnitTestProject + KozaniManagerRuntimeTests + + + DynamicLibrary + false + v143 + Unicode + + + true + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + Use + true + pch.h + $(RepoRoot)\test\inc;$(RepoRoot)\dev\common;$(VCInstallDir)UnitTest\include;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories) + $(RepoRoot);%(AdditionalIncludeDirectories) + + + Windows + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies) + $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) + + + + + _DEBUG;%(PreprocessorDefinitions) + + + + + NDEBUG;%(PreprocessorDefinitions) + + + + + WIN32;%(PreprocessorDefinitions) + + + + + Create + + + + + + + + + + + + $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.Windows.ApplicationModel.WindowsAppRuntime.winmd + true + + + + + {f76b776e-86f5-48c5-8fc7-d2795ecc9746} + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + diff --git a/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.vcxproj.filters b/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.vcxproj.filters new file mode 100644 index 0000000000..ccb428fb94 --- /dev/null +++ b/test/Kozani/KozaniManagerRuntimeTests/KozaniManagerRuntimeTests.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + + + Header Files + + + + + + diff --git a/test/Kozani/KozaniManagerRuntimeTests/packages.config b/test/Kozani/KozaniManagerRuntimeTests/packages.config new file mode 100644 index 0000000000..64b27f96ec --- /dev/null +++ b/test/Kozani/KozaniManagerRuntimeTests/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/test/Kozani/KozaniManagerRuntimeTests/pch.cpp b/test/Kozani/KozaniManagerRuntimeTests/pch.cpp new file mode 100644 index 0000000000..f59e66e263 --- /dev/null +++ b/test/Kozani/KozaniManagerRuntimeTests/pch.cpp @@ -0,0 +1,6 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +// pch.cpp: source file corresponding to the pre-compiled header + +#include "pch.h" diff --git a/test/Kozani/KozaniManagerRuntimeTests/pch.h b/test/Kozani/KozaniManagerRuntimeTests/pch.h new file mode 100644 index 0000000000..d912e14142 --- /dev/null +++ b/test/Kozani/KozaniManagerRuntimeTests/pch.h @@ -0,0 +1,20 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +#ifndef PCH_H +#define PCH_H + +#include + +#include + +#include +#include + +#include + +#include +#include +#include + +#endif //PCH_H diff --git a/tools/AddProject.ps1 b/tools/AddProject.ps1 index 46008645b8..ff02429890 100644 --- a/tools/AddProject.ps1 +++ b/tools/AddProject.ps1 @@ -208,6 +208,17 @@ function Get-UpdatedContent $featuresymbol = $Feature -Replace "[^A-Za-z0-9_]", "_" $namenofeature = $Name.Replace($Feature, "") + $featureAbbreviation = Get-Abbreviation $Feature + $content = Get-Substitution $content 'TokuchoAbbreviation' $featureAbbreviation + + $nameAbbreviation = Get-Abbreviation $Name + $content = Get-Substitution $content 'PurojekutoTenpuretAbbreviation' $nameAbbreviation + + $namenofeature = $Name.Replace($Feature, "") + $namenofeatureAbbreviation = Get-Abbreviation $namenofeature + $content = Get-Substitution $content 'PurojekutoTenpuretNoFeaturePrefixAbbreviation' $namenofeatureAbbreviation + $content = Get-Substitution $content 'PurojekutoTenpuretNoFeaturePrefix' $namenofeature + $ext = [System.IO.Path]::GetExtension($filename) if (($ext -eq '.h') -Or ($ext -eq '.cpp')) { @@ -224,19 +235,11 @@ function Get-UpdatedContent $content = $content.Replace($before, $after) } - $content = $content.Replace("TokuchoNamespace", "$($featurenamespace)") - $content = $content.Replace("TOKUCHONAMESPACE", "$($featurenamespace)".ToUpperInvariant()) - $content = $content.Replace("tokuchonamespace", "$($featurenamespace)".ToLowerInvariant()) - $content = $content.Replace("TokuchoDotNamespace", "$($featuredotnamespace)") - $content = $content.Replace("TOKUCHODOTNAMESPACE", "$($featuredotnamespace)".ToUpperInvariant()) - $content = $content.Replace("tokuchodotnamespace", "$($featuredotnamespace)".ToLowerInvariant()) - $content = $content.Replace("TokuchoSymbol", "$($featuresymbol)") - $CONTENT = $CONTENT.REPLACE("TOKUCHOSYMBOL", "$($featuresymbol)".ToUpperInvariant()) - $CONTENT = $CONTENT.REPLACE("tokuchosymbol", "$($featuresymbol)".ToLowerInvariant()) + $content = Get-Substitution $content 'TokuchoNamespace' $featurenamespace + $content = Get-Substitution $content 'TokuchoDotNamespace' $featuredotnamespace + $content = Get-Substitution $content 'TokuchoSymbol' $featuresymbol - $content = $content.Replace("PurojekutoTenpuretNoFeaturePrefix", $namenofeature) - $content = $content.Replace("PUROJEKUTOTENPURETNOFEATUREPREFIX", $namenofeature.ToUpperInvariant()) - $content = $content.Replace("purojekutotenpuretnofeatureprefix", $namenofeature.ToLowerInvariant()) + $content = Get-Substitution $content 'PurojekutoTenpuretNoFeaturePrefix' $namenofeature $content = $content.Replace($Feature, $featurenamespace) @@ -278,16 +281,10 @@ function Get-UpdatedContent $content = $content.Replace($before, $after) } - $content = $content.Replace("TokuchoNamespace", "$($featurenamespace)") - $content = $content.Replace("TOKUCHONAMESPACE", "$($featurenamespace)".ToUpperInvariant()) - $content = $content.Replace("tokuchonamespace", "$($featurenamespace)".ToLowerInvariant()) - $content = $content.Replace("TokuchoSymbol", "$($featuresymbol)") - $CONTENT = $CONTENT.REPLACE("TOKUCHOSYMBOL", "$($featuresymbol)".ToUpperInvariant()) - $CONTENT = $CONTENT.REPLACE("tokuchosymbol", "$($featuresymbol)".ToLowerInvariant()) + $content = Get-Substitution $content 'TokuchoNamespace' $featurenamespace + $content = Get-Substitution $content 'TokuchoSymbol' $featuresymbol - $content = $content.Replace("PurojekutoTenpuretNoFeaturePrefix", $namenofeature) - $content = $content.Replace("PUROJEKUTOTENPURETNOFEATUREPREFIX", $namenofeature.ToUpperInvariant()) - $content = $content.Replace("purojekutotenpuretnofeatureprefix", $namenofeature.ToLowerInvariant()) + $content = Get-Substitution $content 'PurojekutoTenpuretNoFeaturePrefix' $namenofeature $newguid = $(New-Guid).Guid $uuid = "[uuid(00000000-0000-0000-0000-000000000000)]" @@ -323,6 +320,20 @@ function Get-UpdatedContent $content } +function Get-Substitution +{ + param( + [string]$s, + [string]$from, + [string]$to + ) + + $s = $s.Replace($from, $to) + $s = $s.Replace($from.ToUpperInvariant(), $to.ToUpperInvariant()) + $s = $s.Replace($from.ToLowerInvariant(), $to.ToLowerInvariant()) + $s +} + function Get-ProjectTemplateOutputFileName { param( @@ -336,13 +347,13 @@ function Get-ProjectTemplateOutputFileName $namenofeatureAbbreviation = Get-Abbreviation $namenofeature $outfn = $filename - $outfn = $outfn.Replace('TokuchoAbbreviation', $featureAbbreviation) - $outfn = $outfn.Replace('PurojekutoTenpuretAbbreviation', $nameAbbreviation) - $outfn = $outfn.Replace('PurojekutoTenpuretNoFeaturePrefixAbbreviation', $namenofeatureAbbreviation) - $outfn = $outfn.Replace('PurojekutoTenpuretNoProxyStubSuffix', $Name.Replace('ProxyStub', '')) - $outfn = $outfn.Replace('PurojekutoTenpuret', $Name) - $outfn = $outfn.Replace('PurojekutoTenpuret'.ToUpperInvariant(), $Name.ToUpperInvariant()) - $outfn = $outfn.Replace('PurojekutoTenpuret'.ToLowerInvariant(), $Name.ToLowerInvariant()) + $outfn = Get-Substitution $outfn 'TokuchoAbbreviation' $featureAbbreviation + $outfn = Get-Substitution $outfn 'Tokucho' $feature + $outfn = Get-Substitution $outfn 'PurojekutoTenpuretAbbreviation' $nameAbbreviation + $outfn = Get-Substitution $outfn 'PurojekutoTenpuretNoFeaturePrefixAbbreviation' $namenofeatureAbbreviation + $outfn = Get-Substitution $outfn 'PurojekutoTenpuretNoFeaturePrefix' $namenofeature + $outfn = Get-Substitution $outfn 'PurojekutoTenpuretNoProxyStubSuffix' $Name.Replace('ProxyStub', '') + $outfn = Get-Substitution $outfn 'PurojekutoTenpuret' $Name $outfn } @@ -478,12 +489,8 @@ function Add-Project # Change placemarkers in the file content $in = Get-Content -Path $source -Encoding utf8 -Raw $out = $(Get-UpdatedContent $source $in) - $out = $out.Replace('Tokucho', $Feature) - $out = $out.Replace('Tokucho'.ToUpperInvariant(), $Name.ToUpperInvariant()) - $out = $out.Replace('Tokucho'.ToLowerInvariant(), $Name.ToLowerInvariant()) - $out = $out.Replace('PurojekutoTenpuret', $Name) - $out = $out.Replace('PurojekutoTenpuret'.ToUpperInvariant(), $Name.ToUpperInvariant()) - $out = $out.Replace('PurojekutoTenpuret'.ToLowerInvariant(), $Name.ToLowerInvariant()) + $out = Get-Substitution $out 'Tokucho' $Feature + $out = Get-Substitution $out 'PurojekutoTenpuret' $Name $out = $out.TrimEnd() Write-Host "Transforming $f to $outfn" diff --git a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.cpp b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.cpp similarity index 83% rename from tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.cpp rename to tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.cpp index ea30c753a2..1e3d806148 100644 --- a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.cpp +++ b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.cpp @@ -3,9 +3,9 @@ #include "pch.h" -#include "M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.h" +#include "M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.h" -#include "Microsoft.TokuchoDotNamespace.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.g.cpp" +#include "Microsoft.TokuchoDotNamespace.PurojekutoTenpuretNoFeaturePrefix.PurojekutoTenpuretNoFeaturePrefixManager.g.cpp" namespace winrt::Microsoft::TokuchoNamespace::PurojekutoTenpuretNoFeaturePrefix::implementation { diff --git a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.h b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.h similarity index 88% rename from tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.h rename to tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.h index 87e14cce15..14f9c03b6c 100644 --- a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviationManager.h +++ b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/M.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.h @@ -3,7 +3,7 @@ #pragma once -#include "Microsoft.TokuchoAbbreviation.PurojekutoTenpuretNoFeaturePrefixAbbreviation.PurojekutoTenpuretNoFeaturePrefixManager.g.h" +#include "Microsoft.Tokucho.PurojekutoTenpuretNoFeaturePrefix.PurojekutoTenpuretNoFeaturePrefixManager.g.h" namespace winrt::Microsoft::TokuchoNamespace::PurojekutoTenpuretNoFeaturePrefix::implementation { diff --git a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj index d9de12fbeb..c501c2b511 100644 --- a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj +++ b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj @@ -158,7 +158,7 @@ - + @@ -166,7 +166,7 @@ - + Create Create diff --git a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj.filters b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj.filters index 4ca4e6980f..9498ae70b9 100644 --- a/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj.filters +++ b/tools/ProjectTemplates/dev.cpp.dll.winrt-client-server/PurojekutoTenpuret.vcxproj.filters @@ -30,6 +30,9 @@ Header Files + + Header Files + @@ -47,6 +50,9 @@ Source Files + + Source Files +