Skip to content

Commit 93be3a6

Browse files
cgallredcgallred
authored
Merge pull request #40 from erikma/dev/erikmav/netcore31
Add .NET Core 3.1 targeting and package generation
2 parents 749cb87 + 05539d5 commit 93be3a6

17 files changed

+425
-422
lines changed

‎ProjectedFSLib.Managed.API/NetCore/ProjectedFSLib.Managed.Netcore.vcxproj

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ProjectGuid>{D29E5723-25E6-41C7-AEB9-099CDE30538A}</ProjectGuid>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<CLRSupport>NetCore</CLRSupport>
7+
</PropertyGroup>
8+
9+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10+
<ClCompile>
11+
<!-- C4564: NetCore added default parameters instead of supporting many overloads.
12+
This warning is too broad as it flags methods of imported types whether or not the
13+
code is using that method. -->
14+
<DisableSpecificWarnings>4564</DisableSpecificWarnings>
15+
</ClCompile>
16+
</ItemDefinitionGroup>
17+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
18+
<ClCompile>
19+
<!-- C4564: NetCore added default parameters instead of supporting many overloads.
20+
This warning is too broad as it flags methods of imported types whether or not the
21+
code is using that method. -->
22+
<DisableSpecificWarnings>4564</DisableSpecificWarnings>
23+
</ClCompile>
24+
</ItemDefinitionGroup>
25+
26+
<Import Project="..\ProjectedFSLib.Managed.props" />
27+
</Project>

‎ProjectedFSLib.Managed.API/NetFramework/ProjectedFSLib.Managed.vcxproj

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ProjectGuid>{4E5F40B3-B56F-4B62-92CB-68E7E0E36AFA}</ProjectGuid>
5+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
6+
<CLRSupport>true</CLRSupport>
7+
</PropertyGroup>
8+
9+
<Import Project="..\ProjectedFSLib.Managed.props" />
10+
11+
<ItemGroup>
12+
<Reference Include="System" />
13+
<Reference Include="System.Data" />
14+
<Reference Include="System.Xml" />
15+
</ItemGroup>
16+
</Project>

‎ProjectedFSLib.Managed.API/ProjectedFSLib.Managed.vcxproj.filters ‎ProjectedFSLib.Managed.API/NetFramework/ProjectedFSLib.Managed.vcxproj.filters

+113-113
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,114 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<Filter Include="Source Files">
5-
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6-
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7-
</Filter>
8-
<Filter Include="Header Files">
9-
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10-
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
11-
</Filter>
12-
<Filter Include="Resource Files">
13-
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14-
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15-
</Filter>
16-
</ItemGroup>
17-
<ItemGroup>
18-
<ClInclude Include="stdafx.h">
19-
<Filter>Header Files</Filter>
20-
</ClInclude>
21-
<ClInclude Include="Resource.h">
22-
<Filter>Header Files</Filter>
23-
</ClInclude>
24-
<ClInclude Include="ApiHelper.h">
25-
<Filter>Header Files</Filter>
26-
</ClInclude>
27-
<ClInclude Include="CallbackDelegates.h">
28-
<Filter>Header Files</Filter>
29-
</ClInclude>
30-
<ClInclude Include="DirectoryEnumerationResults.h">
31-
<Filter>Header Files</Filter>
32-
</ClInclude>
33-
<ClInclude Include="HResult.h">
34-
<Filter>Header Files</Filter>
35-
</ClInclude>
36-
<ClInclude Include="IVirtualizationInstance.h">
37-
<Filter>Header Files</Filter>
38-
</ClInclude>
39-
<ClInclude Include="NotificationMapping.h">
40-
<Filter>Header Files</Filter>
41-
</ClInclude>
42-
<ClInclude Include="NotificationType.h">
43-
<Filter>Header Files</Filter>
44-
</ClInclude>
45-
<ClInclude Include="OnDiskFileState.h">
46-
<Filter>Header Files</Filter>
47-
</ClInclude>
48-
<ClInclude Include="UpdateFailureCause.h">
49-
<Filter>Header Files</Filter>
50-
</ClInclude>
51-
<ClInclude Include="UpdateType.h">
52-
<Filter>Header Files</Filter>
53-
</ClInclude>
54-
<ClInclude Include="Utils.h">
55-
<Filter>Header Files</Filter>
56-
</ClInclude>
57-
<ClInclude Include="VirtualizationInstance.h">
58-
<Filter>Header Files</Filter>
59-
</ClInclude>
60-
<ClInclude Include="WriteBuffer.h">
61-
<Filter>Header Files</Filter>
62-
</ClInclude>
63-
<ClInclude Include="prjlib_deprecated.h">
64-
<Filter>Header Files</Filter>
65-
</ClInclude>
66-
<ClInclude Include="IRequiredCallbacks.h">
67-
<Filter>Header Files</Filter>
68-
</ClInclude>
69-
<ClInclude Include="IDirectoryEnumerationResults.h">
70-
<Filter>Header Files</Filter>
71-
</ClInclude>
72-
<ClInclude Include="IWriteBuffer.h">
73-
<Filter>Header Files</Filter>
74-
</ClInclude>
75-
</ItemGroup>
76-
<ItemGroup>
77-
<ClCompile Include="AssemblyInfo.cpp">
78-
<Filter>Source Files</Filter>
79-
</ClCompile>
80-
<ClCompile Include="stdafx.cpp">
81-
<Filter>Source Files</Filter>
82-
</ClCompile>
83-
<ClCompile Include="ApiHelper.cpp">
84-
<Filter>Source Files</Filter>
85-
</ClCompile>
86-
<ClCompile Include="Utils.cpp">
87-
<Filter>Source Files</Filter>
88-
</ClCompile>
89-
<ClCompile Include="VirtualizationInstance.cpp">
90-
<Filter>Source Files</Filter>
91-
</ClCompile>
92-
<ClCompile Include="WriteBuffer.cpp">
93-
<Filter>Source Files</Filter>
94-
</ClCompile>
95-
</ItemGroup>
96-
<ItemGroup>
97-
<ResourceCompile Include="app.rc">
98-
<Filter>Resource Files</Filter>
99-
</ResourceCompile>
100-
</ItemGroup>
101-
<ItemGroup>
102-
<Image Include="app.ico">
103-
<Filter>Resource Files</Filter>
104-
</Image>
105-
</ItemGroup>
106-
<ItemGroup>
107-
<None Include="scripts\CreateVersionHeader.bat">
108-
<Filter>Source Files</Filter>
109-
</None>
110-
<None Include="scripts\CreateCliAssemblyVersion.bat">
111-
<Filter>Source Files</Filter>
112-
</None>
113-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClInclude Include="stdafx.h">
19+
<Filter>Header Files</Filter>
20+
</ClInclude>
21+
<ClInclude Include="Resource.h">
22+
<Filter>Header Files</Filter>
23+
</ClInclude>
24+
<ClInclude Include="ApiHelper.h">
25+
<Filter>Header Files</Filter>
26+
</ClInclude>
27+
<ClInclude Include="CallbackDelegates.h">
28+
<Filter>Header Files</Filter>
29+
</ClInclude>
30+
<ClInclude Include="DirectoryEnumerationResults.h">
31+
<Filter>Header Files</Filter>
32+
</ClInclude>
33+
<ClInclude Include="HResult.h">
34+
<Filter>Header Files</Filter>
35+
</ClInclude>
36+
<ClInclude Include="IVirtualizationInstance.h">
37+
<Filter>Header Files</Filter>
38+
</ClInclude>
39+
<ClInclude Include="NotificationMapping.h">
40+
<Filter>Header Files</Filter>
41+
</ClInclude>
42+
<ClInclude Include="NotificationType.h">
43+
<Filter>Header Files</Filter>
44+
</ClInclude>
45+
<ClInclude Include="OnDiskFileState.h">
46+
<Filter>Header Files</Filter>
47+
</ClInclude>
48+
<ClInclude Include="UpdateFailureCause.h">
49+
<Filter>Header Files</Filter>
50+
</ClInclude>
51+
<ClInclude Include="UpdateType.h">
52+
<Filter>Header Files</Filter>
53+
</ClInclude>
54+
<ClInclude Include="Utils.h">
55+
<Filter>Header Files</Filter>
56+
</ClInclude>
57+
<ClInclude Include="VirtualizationInstance.h">
58+
<Filter>Header Files</Filter>
59+
</ClInclude>
60+
<ClInclude Include="WriteBuffer.h">
61+
<Filter>Header Files</Filter>
62+
</ClInclude>
63+
<ClInclude Include="prjlib_deprecated.h">
64+
<Filter>Header Files</Filter>
65+
</ClInclude>
66+
<ClInclude Include="IRequiredCallbacks.h">
67+
<Filter>Header Files</Filter>
68+
</ClInclude>
69+
<ClInclude Include="IDirectoryEnumerationResults.h">
70+
<Filter>Header Files</Filter>
71+
</ClInclude>
72+
<ClInclude Include="IWriteBuffer.h">
73+
<Filter>Header Files</Filter>
74+
</ClInclude>
75+
</ItemGroup>
76+
<ItemGroup>
77+
<ClCompile Include="AssemblyInfo.cpp">
78+
<Filter>Source Files</Filter>
79+
</ClCompile>
80+
<ClCompile Include="stdafx.cpp">
81+
<Filter>Source Files</Filter>
82+
</ClCompile>
83+
<ClCompile Include="ApiHelper.cpp">
84+
<Filter>Source Files</Filter>
85+
</ClCompile>
86+
<ClCompile Include="Utils.cpp">
87+
<Filter>Source Files</Filter>
88+
</ClCompile>
89+
<ClCompile Include="VirtualizationInstance.cpp">
90+
<Filter>Source Files</Filter>
91+
</ClCompile>
92+
<ClCompile Include="WriteBuffer.cpp">
93+
<Filter>Source Files</Filter>
94+
</ClCompile>
95+
</ItemGroup>
96+
<ItemGroup>
97+
<ResourceCompile Include="app.rc">
98+
<Filter>Resource Files</Filter>
99+
</ResourceCompile>
100+
</ItemGroup>
101+
<ItemGroup>
102+
<Image Include="app.ico">
103+
<Filter>Resource Files</Filter>
104+
</Image>
105+
</ItemGroup>
106+
<ItemGroup>
107+
<None Include="scripts\CreateVersionHeader.bat">
108+
<Filter>Source Files</Filter>
109+
</None>
110+
<None Include="scripts\CreateCliAssemblyVersion.bat">
111+
<Filter>Source Files</Filter>
112+
</None>
113+
</ItemGroup>
114114
</Project>

0 commit comments

Comments
 (0)