Skip to content

Commit

Permalink
Merge pull request #40 from erikma/dev/erikmav/netcore31
Browse files Browse the repository at this point in the history
Add .NET Core 3.1 targeting and package generation
  • Loading branch information
cgallred authored Dec 17, 2019
2 parents 749cb87 + 05539d5 commit 93be3a6
Show file tree
Hide file tree
Showing 17 changed files with 425 additions and 422 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{D29E5723-25E6-41C7-AEB9-099CDE30538A}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<CLRSupport>NetCore</CLRSupport>
</PropertyGroup>

<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<!-- C4564: NetCore added default parameters instead of supporting many overloads.
This warning is too broad as it flags methods of imported types whether or not the
code is using that method. -->
<DisableSpecificWarnings>4564</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<!-- C4564: NetCore added default parameters instead of supporting many overloads.
This warning is too broad as it flags methods of imported types whether or not the
code is using that method. -->
<DisableSpecificWarnings>4564</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>

<Import Project="..\ProjectedFSLib.Managed.props" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{4E5F40B3-B56F-4B62-92CB-68E7E0E36AFA}</ProjectGuid>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<CLRSupport>true</CLRSupport>
</PropertyGroup>

<Import Project="..\ProjectedFSLib.Managed.props" />

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ApiHelper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CallbackDelegates.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DirectoryEnumerationResults.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HResult.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IVirtualizationInstance.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NotificationMapping.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NotificationType.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="OnDiskFileState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="UpdateFailureCause.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="UpdateType.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="VirtualizationInstance.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="WriteBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="prjlib_deprecated.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IRequiredCallbacks.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IDirectoryEnumerationResults.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IWriteBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ApiHelper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VirtualizationInstance.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WriteBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="app.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Image Include="app.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<None Include="scripts\CreateVersionHeader.bat">
<Filter>Source Files</Filter>
</None>
<None Include="scripts\CreateCliAssemblyVersion.bat">
<Filter>Source Files</Filter>
</None>
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ApiHelper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CallbackDelegates.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DirectoryEnumerationResults.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HResult.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IVirtualizationInstance.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NotificationMapping.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NotificationType.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="OnDiskFileState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="UpdateFailureCause.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="UpdateType.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="VirtualizationInstance.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="WriteBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="prjlib_deprecated.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IRequiredCallbacks.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IDirectoryEnumerationResults.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IWriteBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ApiHelper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VirtualizationInstance.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WriteBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="app.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Image Include="app.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<None Include="scripts\CreateVersionHeader.bat">
<Filter>Source Files</Filter>
</None>
<None Include="scripts\CreateCliAssemblyVersion.bat">
<Filter>Source Files</Filter>
</None>
</ItemGroup>
</Project>
Loading

0 comments on commit 93be3a6

Please sign in to comment.