-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[shiftmedia-libgcrypt] new port (Windows fork of Libgcrypt) #26364
Changes from 16 commits
bc53711
3a95a46
1cd86d5
dd1c684
200b401
353a7bb
cfb6e17
feffc18
cbded1a
0a57df4
069300d
edc8ddf
ef97828
6e4c59f
6084eec
3aa9557
2e440ad
7440e82
ad5fb08
4c1dca8
12b6841
1d2cb57
c7b98b5
8a26453
1375c18
1e3ef57
37a4643
bf8d8bf
7f82cf0
146c50c
1aea01b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/SMP/libgpg-error_winrt.vcxproj b/SMP/llibgpg-error_winrt.vcxproj | ||
index e1acf679..f9c302be 100644 | ||
--- a/SMP/libgpg-error_winrt.vcxproj | ||
+++ b/SMP/libgpg-error_winrt.vcxproj | ||
@@ -3,6 +3,7 @@ | ||
<PropertyGroup Label="Globals"> | ||
<ProjectGuid>{AA4A762D-A8D7-4F68-9B79-FBE63C6BE105}</ProjectGuid> | ||
<RootNamespace>gpg-error</RootNamespace> | ||
+ <TargetPlatformMinVersion>10.0.17200.0</TargetPlatformMinVersion> | ||
</PropertyGroup> | ||
<ImportGroup Label="PropertySheets"> | ||
<Import Project="smp_winrt.props" /> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"name": "libgpg-error", | ||
"version": "1.42", | ||
"port-version": 3, | ||
"port-version": 4, | ||
"description": "A common dependency of all GnuPG components", | ||
"homepage": "https://gnupg.org/software/libgpg-error/index.html", | ||
"supports": "!(windows & (arm | arm64))" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any chance that this may fix arm or arm64? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. https://github.com/ShiftMediaProject/libgpg-error/blob/master/SMP/libgpg-error.vcxproj doesn't support arm/arm64 platforms, so that can't work ("The specified solution configuration "ReleaseDLLWinRT|arm" is invalid"). That having said, I was close (#20447) to getting There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK, just wanted to be sure it was considered since our CI does not validate supports expressions |
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
diff --git a/SMP/libgcrypt.vcxproj b/SMP/libgcrypt.vcxproj | ||
index b8d06f19..12d59dd5 100644 | ||
--- a/SMP/libgcrypt.vcxproj | ||
+++ b/SMP/libgcrypt.vcxproj | ||
@@ -70,7 +70,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -237,7 +237,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -292,7 +292,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -404,7 +404,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
@@ -516,7 +516,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
diff --git a/SMP/libgcrypt_winrt.vcxproj b/SMP/libgcrypt_winrt.vcxproj | ||
index e1acf679..62f3f7b6 100644 | ||
--- a/SMP/libgcrypt_winrt.vcxproj | ||
+++ b/SMP/libgcrypt_winrt.vcxproj | ||
@@ -15,7 +15,7 @@ | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -70,7 +70,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -126,7 +126,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>gpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
@@ -182,7 +182,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>gpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
@@ -237,7 +237,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -292,7 +292,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Lib> | ||
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Lib> | ||
<PostBuildEvent> | ||
@@ -348,7 +348,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>gpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
@@ -404,7 +404,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
@@ -460,7 +460,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>gpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> | ||
@@ -516,7 +516,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt | ||
</ClCompile> | ||
<Link> | ||
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile> | ||
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions> | ||
</Link> | ||
<PostBuildEvent> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,188 @@ | ||
diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props | ||
index 9dc3dc02..f25786fc 100644 | ||
--- a/SMP/smp_deps.props | ||
+++ b/SMP/smp_deps.props | ||
@@ -105,7 +105,7 @@ | ||
<PropertyGroup Label="UserMacros" /> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
<TargetName>lib$(RootNamespace)d</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -113,7 +113,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
<TargetName>lib$(RootNamespace)d</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -121,7 +121,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> | ||
<TargetName>$(RootNamespace)d</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -129,7 +129,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> | ||
<TargetName>$(RootNamespace)d</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -137,7 +137,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
<TargetName>lib$(RootNamespace)</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -145,7 +145,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
<TargetName>lib$(RootNamespace)</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -153,7 +153,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> | ||
<TargetName>$(RootNamespace)</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -161,7 +161,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> | ||
<TargetName>$(RootNamespace)</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -169,7 +169,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLStaticDeps|Win32'"> | ||
<TargetName>$(RootNamespace)</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -177,7 +177,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLStaticDeps|x64'"> | ||
<TargetName>$(RootNamespace)</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props | ||
index fe8c8950..c0cb1637 100644 | ||
--- a/SMP/smp_winrt_deps.props | ||
+++ b/SMP/smp_winrt_deps.props | ||
@@ -116,7 +116,7 @@ | ||
<PropertyGroup Label="UserMacros" /> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'"> | ||
<TargetName>lib$(RootNamespace)d_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -124,7 +124,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'"> | ||
<TargetName>lib$(RootNamespace)d_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -132,7 +132,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'"> | ||
<TargetName>$(RootNamespace)d_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -140,7 +140,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'"> | ||
<TargetName>$(RootNamespace)d_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -148,7 +148,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'"> | ||
<TargetName>lib$(RootNamespace)_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -156,7 +156,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'"> | ||
<TargetName>lib$(RootNamespace)_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -164,7 +164,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'"> | ||
<TargetName>$(RootNamespace)_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -172,7 +172,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'"> | ||
<TargetName>$(RootNamespace)_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -180,7 +180,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRTStaticDeps|Win32'"> | ||
<TargetName>$(RootNamespace)_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> | ||
@@ -188,7 +188,7 @@ | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRTStaticDeps|x64'"> | ||
<TargetName>$(RootNamespace)_winrt</TargetName> | ||
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir> | ||
+ <OutDir>$(ProjectDir)..\msvc\</OutDir> | ||
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> | ||
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir> | ||
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this specific value?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is what I saw in the CI logs used as a minimum required when comparing against – then empty – TargetPlatformMinVersion value.
That having said, I did not test anything less than that, to be frank.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, after doing a little digging, it seems as though this change would be fine. I believe TargetPlatformMinVersion is used to determine the fallback framework and the package format. I believe that setting TargetPlatformMinVersion to 10.0.17200.0 would result in the fallback framework being .NET Framework 4.6.1 and the packaging format being msix, none of which matters for our purposes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot for checking that.