Merge branch 'dotnetcore' of https://github.com/Noire001/winfsp into Noire001-dotnetcore

Contributors.asciidoc

@@ -66,6 +66,7 @@ CONTRIBUTOR LIST
 |Gal Hammer (Red Hat, https://www.redhat.com)                   |ghammer at redhat.com
 |John Oberschelp                                                |john at oberschelp.net
 |John Tyner                                                     |jtyner at gmail.com
+|Konstantinos Karakostas                                        |noiredev at protonmail.com
 |Paweł Wegner (Google LLC, https://google.com)                  |lemourin at google.com
 |Pedro Frejo (Arpa System, https://arpasystem.com)              |pedro.frejo at arpasystem.com
 |Ronny Chan                                                     |ronny at ronnychan.ca

appveyor.yml

@@ -51,6 +51,11 @@ install:
       $targets.Save("C:\Program Files (x86)\Windows Kits\10\build\WindowsDriver.Common.targets")
       Add-AppveyorMessage "Hack to make WDK 1903 work on VS2015"
     }
+# Install .NET SDK on VS2015 image
+- ps: |
+    if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
+        & ([scriptblock]::Create((New-Object System.Net.WebClient).DownloadString('https://dot.net/v1/dotnet-install.ps1'))) -InstallDir "C:\dotnet"
+    }
 # Submodules
 - git submodule update --init --recursive
 # Kernel and user mode dumps
@@ -76,6 +81,9 @@ build_script:
 # remove ARM64 project configurations to build in VS2015/VS2017
 - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" tools\gensrc\remove-build-arm64.bat
 - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" tools\gensrc\remove-build-arm64.bat
+# remove .NET library from solution for VS2015 and use the .NET SDK instead
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" tools\gensrc\remove-build-dotnet.bat build\VStudio
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" set PATH=C:\dotnet;%PATH%
 # build winfsp
 - tools\build.bat %CONFIGURATION%
 

build/VStudio/Directory.Build.props

@@ -0,0 +1,9 @@
+<Project>
+    <Choose>
+        <When Condition="$(MSBuildProjectName)=='memfs-dotnet' or $(MSBuildProjectName)=='winfsp.net'">
+            <PropertyGroup>
+                <BaseIntermediateOutputPath>$(SolutionDir)build\$(MSBuildProjectName).build\</BaseIntermediateOutputPath>
+            </PropertyGroup>
+        </When>
+    </Choose>
+</Project>

build/VStudio/dotnet/winfsp.net.csproj

@@ -1,43 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{94580219-CC8D-4FE5-A3BE-437B0B3481E1}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <ProjectName>winfsp.net</ProjectName>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>Fsp</RootNamespace>
     <AssemblyName>$(MyProductFileName)-msil</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <OutputPath>$(SolutionDir)build\$(Configuration)\$(MSBuildProjectName)</OutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+	<GenerateDocumentationFile>true</GenerateDocumentationFile>
+	<DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\$(MyProductFileName)-msil.xml</DocumentationFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
-    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\$(MyProductFileName)-msil.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
-    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>$(BaseIntermediateOutputPath)$(Configuration)\$(MyProductFileName)-msil.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
@@ -47,9 +42,6 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>winfsp.net.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\src\dotnet\FileSystemBase+Const.cs">
       <Link>FileSystemBase+Const.cs</Link>
@@ -70,29 +62,31 @@
   <ItemGroup>
     <None Include="winfsp.net.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+    <PackageReference Include="Microsoft.Win32.Registry">
-       Other similar extension points exist, see Microsoft.Common.targets.
+      <Version>5.0.0</Version>
-  <Target Name="AfterBuild">
+    </PackageReference>
-  </Target>
+    <PackageReference Include="System.IO.FileSystem.AccessControl">
-  -->
+      <Version>5.0.0</Version>
-  <Target Name="BeforeBuild">
+    </PackageReference>
-    <ItemGroup>
-      <AssemblyInfo Include="using System.Reflection%3b" />
-      <AssemblyInfo Include="[assembly: AssemblyProduct(&quot;$(MyProductName)&quot;)]" />
-      <AssemblyInfo Include="[assembly: AssemblyTitle(&quot;$(MyDescription)&quot;)]" />
-      <AssemblyInfo Include="[assembly: AssemblyCompany(&quot;$(MyCompanyName)&quot;)]" />
-      <AssemblyInfo Include="[assembly: AssemblyCopyright(&quot;$(MyCopyright)&quot;)]" />
-      <AssemblyInfo Include="[assembly: AssemblyVersion(&quot;$(MyAssemblyVersion)&quot;)]" />
-      <AssemblyInfo Include="[assembly: AssemblyFileVersion(&quot;$(MyVersion)&quot;)]" />
   </ItemGroup>
-    <MakeDir Directories="$(IntermediateOutputPath)" />
+
-    <WriteLinesToFile File="$(IntermediateOutputPath)AssemblyInfo.cs" Lines="@(AssemblyInfo)" Overwrite="true" />
+  <PropertyGroup>
-    <ItemGroup>
+    <AssemblyName>$(MyProductFileName)-msil</AssemblyName>
-      <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
+    <AssemblyTitle>$(MyDescription)</AssemblyTitle>
-      <FileWrites Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
+    <Product>$(MyProductName)</Product>
-    </ItemGroup>
+    <Copyright>$(MyCopyright)</Copyright>
-  </Target>
+    <AssemblyVersion>$(MyAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(MyVersion)</FileVersion>
+    
+    <!-- NuGet metadata -->
+    <PackageId>$(MyProductFileName)-msil</PackageId>
+    <Version>$(MyVersion)</Version>
+    <Description>$(MyDescription)</Description>
+    <Authors>$(MyCompanyName)</Authors>
+    <Company>$(MyCompanyName)</Company>
+  </PropertyGroup>
+
   <PropertyGroup>
     <PostBuildEvent>exit /b 0
 

build/VStudio/installer/Product.wxs

@@ -171,10 +171,10 @@
 
             <!-- install assembly -->
             <Component Id="C.$(var.MyProductFileName)_msil.dll" Guid="1772CDE5-4B2F-48CF-B2DA-CA43818053A8">
-                <File Id="FILE.$(var.MyProductFileName)_msil.dll" Name="$(var.MyProductFileName)-msil.dll" KeyPath="yes" />
+                <File Id="FILE.$(var.MyProductFileName)_msil.dll" Source="..\build\$(var.Configuration)\$(var.MyProductFileName).net\net35\" Name="$(var.MyProductFileName)-msil.dll" KeyPath="yes" />
             </Component>
             <Component Id="C.$(var.MyProductFileName)_msil.xml" Guid="C76745D2-51FA-4028-B827-3F2F3F763751">
-                <File Id="FILE.$(var.MyProductFileName)_msil.xml" Name="$(var.MyProductFileName)-msil.xml" KeyPath="yes" />
+                <File Id="FILE.$(var.MyProductFileName)_msil.xml" Source="..\build\$(var.Configuration)\$(var.MyProductFileName).net\net35\" Name="$(var.MyProductFileName)-msil.xml" KeyPath="yes" />
             </Component>
             <!--
             <Component Id="C.$(var.MyProductFileName)_msil.dll.GAC" Guid="D86F8764-2FCC-43DA-A174-23E0FD6D45B7">
@@ -373,7 +373,7 @@
                 </RegistryKey>
             </Component>
             <Component Id="C.memfs_dotnet_msil.exe">
-                <File Name="memfs-dotnet-msil.exe" KeyPath="yes" />
+                <File Name="memfs-dotnet-msil.exe" Source="..\build\$(var.Configuration)\memfs-dotnet\net452\" KeyPath="yes" />
                 <RegistryKey
                     Root="HKLM"
                     Key="[P.LauncherRegistryKey]">

build/VStudio/testing/memfs-dotnet.csproj

@@ -1,28 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.SDK">
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4920E350-D496-4652-AE98-6C4208AEC1D8}</ProjectGuid>
     <OutputType>Exe</OutputType>
+    <TargetFramework>net452</TargetFramework>
     <ProjectName>memfs-dotnet</ProjectName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>memfs</RootNamespace>
     <AssemblyName>memfs-dotnet-msil</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\$(MSBuildProjectName)</OutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
-    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -32,33 +24,14 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
-    <BaseIntermediateOutputPath>$(SolutionDir)build\$(ProjectName).build\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
+    <ProjectReference Include="..\dotnet\winfsp.net.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\tst\memfs-dotnet\Program.cs">
+    <Compile Include="..\..\..\tst\memfs-dotnet\Program.cs" />
-      <Link>Program.cs</Link>
-    </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dotnet\winfsp.net.csproj">
-      <Project>{94580219-cc8d-4fe5-a3be-437b0b3481e1}</Project>
-      <Name>winfsp.net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

tools/build.bat

@@ -27,6 +27,7 @@ if X%~nx0==Xbuild-choco.bat (
 set BuildArm64=yes
 if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (
     set BuildArm64=no
+    set UseDotnetSdk=yes
 )
 if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (
     set BuildArm64=no
@@ -57,6 +58,13 @@ if X%SignedPackage%==X (
         if exist "%%d" rmdir /s/q "%%d"
     )
 	
+    if X%UseDotnetSdk%==Xyes (
+        dotnet build ./dotnet/ -c "%Configuration%" -p:SolutionDir=..\
+        if errorlevel 1 goto fail
+        dotnet build ./testing/memfs-dotnet.csproj -c "%Configuration%" -p:SolutionDir=..\
+        if errorlevel 1 goto fail
+    )
+
     if X%BuildArm64%==Xyes (
         devenv winfsp.sln /build "%Configuration%|ARM64"
         if errorlevel 1 goto fail

tools/gensrc/remove-build-dotnet.bat

@@ -0,0 +1,17 @@
+@echo off
+
+setlocal
+setlocal EnableDelayedExpansion
+
+if "%1"=="" (
+    cd %~dp0..\..
+) else (
+    cd "%1"
+)
+
+
+if exist winfsp.sln (
+    powershell -NoProfile -ExecutionPolicy Bypass -Command "& '%~dp0remove-sln-project.ps1' -Path '%cd%\winfsp.sln' -Match '*dotnet*'
+) else (
+    echo winfsp.sln not found in %cd%
+)

tools/gensrc/remove-sln-project.ps1

@@ -0,0 +1,12 @@
+param (
+    [Parameter(Mandatory)][string]$Path,
+    [Parameter(Mandatory)][string]$Match
+)
+
+echo "Removing projects that match $($Match) from $($Path)"
+
+Get-Content $Path -Delimiter 'EndProject' |
+  Where-Object {$_ -notlike $Match} |
+  Set-Content "$($Path).new"
+  
+ Move-Item -Path "$($Path).new" -Destination $Path -Force