Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 24 additions & 24 deletions BenchmarkComponent/BenchmarkComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace winrt::BenchmarkComponent::implementation
return 1;
}

void ClassWithMultipleInterfaces::IntProperty(int32_t val)
void ClassWithMultipleInterfaces::IntProperty(int32_t /*val*/)
{
}

Expand All @@ -55,7 +55,7 @@ namespace winrt::BenchmarkComponent::implementation
return true;
}

void ClassWithMultipleInterfaces::BoolProperty(bool val)
void ClassWithMultipleInterfaces::BoolProperty(bool /*val*/)
{
}

Expand All @@ -64,7 +64,7 @@ namespace winrt::BenchmarkComponent::implementation
return 1;
}

void ClassWithMultipleInterfaces::DoubleProperty(double val)
void ClassWithMultipleInterfaces::DoubleProperty(double /*val*/)
{
}

Expand All @@ -83,22 +83,22 @@ namespace winrt::BenchmarkComponent::implementation
return 1;
}

void ClassWithMultipleInterfaces::DefaultIntProperty(int32_t val)
void ClassWithMultipleInterfaces::DefaultIntProperty(int32_t /*val*/)
{
}

void ClassWithMultipleInterfaces::DefaultBoolProperty(bool val)
void ClassWithMultipleInterfaces::DefaultBoolProperty(bool /*val*/)
{
}

void ClassWithMultipleInterfaces::DefaultDoubleProperty(double val)
void ClassWithMultipleInterfaces::DefaultDoubleProperty(double /*val*/)
{
}

void ClassWithMultipleInterfaces::QueryBoolInterface(IIntProperties properties)
{
auto boolProperties = properties.as<IBoolProperties>();
boolProperties.BoolProperty();
(void)boolProperties.BoolProperty();
}

Windows::Foundation::Collections::IVector<winrt::hstring> createList()
Expand All @@ -123,7 +123,7 @@ namespace winrt::BenchmarkComponent::implementation
return hstring();
}

void ClassWithMarshalingRoutines::DefaultStringProperty(hstring val)
void ClassWithMarshalingRoutines::DefaultStringProperty(hstring /*val*/)
{
}

Expand Down Expand Up @@ -168,7 +168,7 @@ namespace winrt::BenchmarkComponent::implementation
return createKeyValuePairObject();
}

void ClassWithMarshalingRoutines::NewTypeErasedKeyValuePairObject(Windows::Foundation::IInspectable val)
void ClassWithMarshalingRoutines::NewTypeErasedKeyValuePairObject(Windows::Foundation::IInspectable /*val*/)
{
}

Expand All @@ -177,7 +177,7 @@ namespace winrt::BenchmarkComponent::implementation
return createNullableObject();
}

void ClassWithMarshalingRoutines::NewTypeErasedNullableObject(Windows::Foundation::IInspectable val)
void ClassWithMarshalingRoutines::NewTypeErasedNullableObject(Windows::Foundation::IInspectable /*val*/)
{
}

Expand All @@ -186,7 +186,7 @@ namespace winrt::BenchmarkComponent::implementation
return createArrayObject();
}

void ClassWithMarshalingRoutines::NewTypeErasedArrayObject(Windows::Foundation::IInspectable val)
void ClassWithMarshalingRoutines::NewTypeErasedArrayObject(Windows::Foundation::IInspectable /*val*/)
{
}

Expand All @@ -195,7 +195,7 @@ namespace winrt::BenchmarkComponent::implementation
return keyValuePairObject;
}

void ClassWithMarshalingRoutines::ExistingTypeErasedKeyValuePairObject(Windows::Foundation::IInspectable val)
void ClassWithMarshalingRoutines::ExistingTypeErasedKeyValuePairObject(Windows::Foundation::IInspectable /*val*/)
{
}

Expand All @@ -204,7 +204,7 @@ namespace winrt::BenchmarkComponent::implementation
return nullableObject;
}

void ClassWithMarshalingRoutines::ExistingTypeErasedNullableObject(Windows::Foundation::IInspectable val)
void ClassWithMarshalingRoutines::ExistingTypeErasedNullableObject(Windows::Foundation::IInspectable /*val*/)
{
}

Expand All @@ -213,7 +213,7 @@ namespace winrt::BenchmarkComponent::implementation
return arrayObject;
}

void ClassWithMarshalingRoutines::ExistingTypeErasedArrayObject(Windows::Foundation::IInspectable val)
void ClassWithMarshalingRoutines::ExistingTypeErasedArrayObject(Windows::Foundation::IInspectable /*val*/)
{
}

Expand All @@ -222,7 +222,7 @@ namespace winrt::BenchmarkComponent::implementation
return make<WrappedClass>();
}

void ClassWithMarshalingRoutines::NewWrappedClassObject(BenchmarkComponent::WrappedClass val)
void ClassWithMarshalingRoutines::NewWrappedClassObject(BenchmarkComponent::WrappedClass /*val*/)
{
}

Expand All @@ -232,7 +232,7 @@ namespace winrt::BenchmarkComponent::implementation
return uri;
}

void ClassWithMarshalingRoutines::NewUri(Windows::Foundation::Uri val)
void ClassWithMarshalingRoutines::NewUri(Windows::Foundation::Uri /*val*/)
{
}

Expand All @@ -241,7 +241,7 @@ namespace winrt::BenchmarkComponent::implementation
return _uri;
}

void ClassWithMarshalingRoutines::ExistingUri(Windows::Foundation::Uri val)
void ClassWithMarshalingRoutines::ExistingUri(Windows::Foundation::Uri /*val*/)
{
}

Expand All @@ -251,7 +251,7 @@ namespace winrt::BenchmarkComponent::implementation
return type;
}

void ClassWithMarshalingRoutines::NewType(Windows::UI::Xaml::Interop::TypeName val)
void ClassWithMarshalingRoutines::NewType(Windows::UI::Xaml::Interop::TypeName /*val*/)
{
}

Expand All @@ -260,7 +260,7 @@ namespace winrt::BenchmarkComponent::implementation
return _type;
}

void ClassWithMarshalingRoutines::ExistingType(Windows::UI::Xaml::Interop::TypeName val)
void ClassWithMarshalingRoutines::ExistingType(Windows::UI::Xaml::Interop::TypeName /*val*/)
{
}

Expand Down Expand Up @@ -294,7 +294,7 @@ namespace winrt::BenchmarkComponent::implementation
}
void ClassWithMarshalingRoutines::NullableTimeSpan(Windows::Foundation::IReference<Windows::Foundation::TimeSpan> const& value)
{
_int = value.Value().count();
_int = static_cast<int32_t>(value.Value().count());
}
Windows::Foundation::IInspectable ClassWithMarshalingRoutines::BoxedDelegate()
{
Expand Down Expand Up @@ -325,7 +325,7 @@ namespace winrt::BenchmarkComponent::implementation
return int32_t();
}

void WrappedClass::DefaultIntProperty(int32_t val)
void WrappedClass::DefaultIntProperty(int32_t /*val*/)
{
}

Expand Down Expand Up @@ -385,14 +385,14 @@ namespace winrt::BenchmarkComponent::implementation
}
void EventOperations::AddIntEvent()
{
intEventToken = events.IntPropertyChanged([this](IInspectable const& sender, int32_t value)
intEventToken = events.IntPropertyChanged([this](IInspectable const& /*sender*/, int32_t value)
{
intVal = value;
});
}
void EventOperations::AddDoubleEvent()
{
doubleEventToken = events.DoublePropertyChanged([this](IInspectable const& sender, double_t value)
doubleEventToken = events.DoublePropertyChanged([this](IInspectable const& /*sender*/, double_t value)
{
doubleVal = value;
});
Expand Down Expand Up @@ -456,7 +456,7 @@ namespace winrt::BenchmarkComponent::implementation
return true;
}

void Composable::BoolProperty(bool val)
void Composable::BoolProperty(bool /*val*/)
{
}
}
18 changes: 8 additions & 10 deletions BenchmarkComponent/BenchmarkComponent.vcxproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.props')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTVerbosity>high</CppWinRTVerbosity>
<CppWinRTOptimized>true</CppWinRTOptimized>
Expand Down Expand Up @@ -47,14 +47,11 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>

<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -75,6 +72,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level4</WarningLevel>
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
<!--Temporarily disable cppwinrt heap enforcement to work around xaml compiler generated std::shared_ptr use -->
Expand Down Expand Up @@ -108,7 +106,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<Midl Include="BenchmarkComponent.idl" >
<Midl Include="BenchmarkComponent.idl">
<AdditionalOptions>/fastabi %(AdditionalOptions)</AdditionalOptions>
</Midl>
</ItemGroup>
Expand All @@ -118,13 +116,13 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.201113.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion BenchmarkComponent/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.201113.7" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
</packages>
1 change: 1 addition & 0 deletions BenchmarkComponent/pch.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once
#include <unknwn.h>
#undef GetCurrentTime
#include <winrt/Windows.Foundation.h>
#include <winrt/Windows.Foundation.Collections.h>
#include <winrt/Windows.UI.Xaml.Interop.h>
Expand Down
13 changes: 7 additions & 6 deletions Console/Console.vcxproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
Expand All @@ -9,7 +9,7 @@
<ProjectGuid>{8ab80bfd-185a-452d-aad2-97b38aed3e4b}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Console</RootNamespace>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand All @@ -34,7 +34,7 @@
<PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
Expand All @@ -60,6 +60,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<LanguageStandard>stdcpp20</LanguageStandard>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj</AdditionalOptions>
Expand Down Expand Up @@ -114,13 +115,13 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Console/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
</packages>
Loading
Loading