Skip to content

Commit

Permalink
Changed wil nuget package linking to git submodule (#515)
Browse files Browse the repository at this point in the history
Deleted link with wil nuget package, switched to git submodule instead.
  • Loading branch information
strongstrongyiwen authored Jun 11, 2020
1 parent 824684c commit 8832c74
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 25 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "wil"]
path = wil
url = https://github.com/microsoft/wil
31 changes: 11 additions & 20 deletions avstream/sampledevicemft/multipinmft.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
27 changes: 26 additions & 1 deletion avstream/sampledevicemft/multipinmft.vcxproj.Filters
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 0 additions & 4 deletions avstream/sampledevicemft/packages.config

This file was deleted.

1 change: 1 addition & 0 deletions wil
Submodule wil added at 3c00e7

0 comments on commit 8832c74

Please sign in to comment.