diff options
| author | strongstrongyiwen <[email protected]> | 2020-06-11 10:26:18 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-11 10:26:18 -0700 |
| commit | 8832c74bd92c222b46a45e122532b009d3c74a14 (patch) | |
| tree | 7ca407ab5c5e2ae3378d33eedec1ce33218a13db /avstream | |
| parent | 824684c664fb8a574b2a79ca0602229c85c562af (diff) | |
Changed wil nuget package linking to git submodule (#515)156867
Deleted link with wil nuget package, switched to git submodule instead.
Diffstat (limited to 'avstream')
| -rw-r--r-- | avstream/sampledevicemft/multipinmft.vcxproj | 31 | ||||
| -rw-r--r-- | avstream/sampledevicemft/multipinmft.vcxproj.Filters | 27 | ||||
| -rw-r--r-- | avstream/sampledevicemft/packages.config | 4 |
3 files changed, 37 insertions, 25 deletions
diff --git a/avstream/sampledevicemft/multipinmft.vcxproj b/avstream/sampledevicemft/multipinmft.vcxproj index 1a0716bb..f13ed67d 100644 --- a/avstream/sampledevicemft/multipinmft.vcxproj +++ b/avstream/sampledevicemft/multipinmft.vcxproj @@ -154,17 +154,9 @@ <WppScanConfigurationData>common.h</WppScanConfigurationData> </ClCompile> </ItemGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <TargetName>multipinmft</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <TargetName>multipinmft</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <TargetName>multipinmft</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <PropertyGroup> <TargetName>multipinmft</TargetName> + <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\wil\include</IncludePath> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -261,18 +253,17 @@ <ItemGroup> <None Exclude="@(None)" Include="*.txt;*.htm;*.html" /> <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" /> - <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" /> - <None Include="packages.config" /> + <None Include="Source.def" /> </ItemGroup> <ItemGroup> - <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" /> + <ClInclude Include="basepin.h" /> + <ClInclude Include="common.h" /> + <ClInclude Include="contosodevice.h" /> + <ClInclude Include="custompin.h" /> + <ClInclude Include="mftpeventgenerator.h" /> + <ClInclude Include="multipinmft.h" /> + <ClInclude Include="multipinmfthelpers.h" /> + <ClInclude Include="stdafx.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="packages\Microsoft.Windows.ImplementationLibrary.1.0.190716.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.190716.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" /> - <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.ImplementationLibrary.1.0.190716.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.ImplementationLibrary.1.0.190716.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" /> - </Target> </Project>
\ No newline at end of file diff --git a/avstream/sampledevicemft/multipinmft.vcxproj.Filters b/avstream/sampledevicemft/multipinmft.vcxproj.Filters index 36af8e37..a4692065 100644 --- a/avstream/sampledevicemft/multipinmft.vcxproj.Filters +++ b/avstream/sampledevicemft/multipinmft.vcxproj.Filters @@ -42,6 +42,31 @@ <None Include="Source.def"> <Filter>Source Files</Filter> </None> - <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="basepin.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="common.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="contosodevice.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="custompin.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="mftpeventgenerator.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="multipinmft.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="multipinmfthelpers.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="stdafx.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/avstream/sampledevicemft/packages.config b/avstream/sampledevicemft/packages.config deleted file mode 100644 index 09cb1163..00000000 --- a/avstream/sampledevicemft/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.190716.2" targetFramework="native" /> -</packages>
\ No newline at end of file |
