Merge branch 'pvt-dotnetcore'

2025-04-22 08:23:05 -05:00 · 2022-11-30 10:06:42 +00:00 · 2022-11-30 10:06:42 +00:00 · 01d9fa1719
commit 01d9fa1719
parent 298261c4af 6846508631
8 changed files with 106 additions and 64 deletions
--- a/Contributors.asciidoc
+++ b/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
--- a/appveyor.yml
+++ b/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%

--- a/build/VStudio/dotnet/winfsp.net.csproj
+++ b/build/VStudio/dotnet/winfsp.net.csproj
@ -1,25 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(MSBuildProjectName).build\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
  <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>{94580219-CC8D-4FE5-A3BE-437B0B3481E1}</ProjectGuid>
    <OutputType>Library</OutputType>
    <ProjectName>winfsp.net</ProjectName>
    <RootNamespace>Fsp</RootNamespace>
    <AssemblyName>$(MyProductFileName)-msil</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
  </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>
@ -32,7 +36,6 @@
    <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>
@ -47,9 +50,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 +70,28 @@
  <ItemGroup>
    <None Include="winfsp.net.snk" />
  </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="AfterBuild">
-  </Target>
-  -->
-  <Target Name="BeforeBuild">
-    <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 Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Win32.Registry">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.FileSystem.AccessControl">
+      <Version>5.0.0</Version>
+    </PackageReference>
  </ItemGroup>
-    <MakeDir Directories="$(IntermediateOutputPath)" />
-    <WriteLinesToFile File="$(IntermediateOutputPath)AssemblyInfo.cs" Lines="@(AssemblyInfo)" Overwrite="true" />
-    <ItemGroup>
-      <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
-      <FileWrites Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
-    </ItemGroup>
-  </Target>
+  <PropertyGroup>
+    <AssemblyName>$(MyProductFileName)-msil</AssemblyName>
+    <AssemblyTitle>$(MyDescription)</AssemblyTitle>
+    <Product>$(MyProductName)</Product>
+    <Copyright>$(MyCopyright)</Copyright>
+    <AssemblyVersion>$(MyAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(MyVersion)</FileVersion>
+    <!-- NuGet metadata -->
+    <PackageId>$(MyProductFileName).net</PackageId>
+    <Version>$(MyVersion)</Version>
+    <Description>$(MyDescription)</Description>
+    <Authors>$(MyCopyright)</Authors>
+    <Company>$(MyCompanyName)</Company>
+  </PropertyGroup>
  <PropertyGroup>
    <PostBuildEvent>exit /b 0

@ -110,4 +109,5 @@ for /f "delims=" %25%25l in ($(ProjectDir)winfsp.net.policy.config) do (
 "$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.0A\Bin\al.exe" /product:"$(MyProductName)" /title:"$(MyDescription)" /company:"$(MyCompanyName)" /copyright:"$(MyCopyright)" /version:"$(MyAssemblyPolicyVersion)" /fileversion:"$(MyVersion)" /link:$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).config /out:$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).dll /keyfile:$(ProjectDir)$(ProjectName).snk
 </PostBuildEvent>
  </PropertyGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
--- a/build/VStudio/testing/memfs-dotnet.csproj
+++ b/build/VStudio/testing/memfs-dotnet.csproj
@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(MSBuildProjectName).build\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
  <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>
    <ProjectName>memfs-dotnet</ProjectName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>memfs</RootNamespace>
    <AssemblyName>memfs-dotnet-msil</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFramework>net452</TargetFramework>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
+  <PropertyGroup>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </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>
@ -33,32 +36,16 @@
    <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">
-      <Link>Program.cs</Link>
-    </Compile>
+    <Compile Include="..\..\..\tst\memfs-dotnet\Program.cs" />
  </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>
-  -->
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
--- a/tools/build.bat
+++ b/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
@ -42,8 +43,11 @@ call "%~dp0vcvarsall.bat" x64
 if not X%SignedPackage%==X (
    if not exist "%~dp0..\build\VStudio\build\%Configuration%\%MyProductFileName%-*.msi" (echo previous build not found >&2 & exit /b 1)
    if not exist "%SignedPackage%" (echo signed package not found >&2 & exit /b 1)
+    set Version=
+    for %%f in (build\%Configuration%\%MyProductFileName%-*.msi) do set Version=%%~nf
+    set Version=!Version:%MyProductFileName%-=!
    del "%~dp0..\build\VStudio\build\%Configuration%\%MyProductFileName%-*.msi"
-    if exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp.*.nupkg" del "%~dp0..\build\VStudio\build\%Configuration%\winfsp.*.nupkg"
+    if exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp.!Version!.nupkg" del "%~dp0..\build\VStudio\build\%Configuration%\winfsp.!Version!.nupkg"
    for /R "%SignedPackage%" %%f in (*.sys) do (
        copy "%%f" "%~dp0..\build\VStudio\build\%Configuration%" >nul
    )
@ -70,6 +74,13 @@ if X%SignedPackage%==X (
        if errorlevel 1 goto fail
    )

+    if X%UseDotnetSdk%==Xyes (
+        dotnet build ./dotnet/winfsp.net.csproj -c "%Configuration%" -p:Platform=AnyCPU -p:SolutionDir="%cd%"\
+        if errorlevel 1 goto fail
+        dotnet build ./testing/memfs-dotnet.csproj -c "%Configuration%" -p:Platform=AnyCPU -p:SolutionDir="%cd%"\
+        if errorlevel 1 goto fail
+    )
+
    pushd build\%Configuration%
    set signfiles=^
        %MyProductFileName%-a64.sys %MyProductFileName%-x64.sys %MyProductFileName%-x86.sys^
--- a/tools/gensrc/remove-build-dotnet.bat
+++ b/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%
+)
--- a/tools/gensrc/remove-sln-project.ps1
+++ b/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
--- a/tools/make-release.ps1
+++ b/tools/make-release.ps1
@ -161,9 +161,15 @@ function Check-Assets {
        exit 1
    }

+    # check winfsp.net.nupkg
+    if (!(Test-Path "$ProjectRoot\build\VStudio\build\Release\winfsp.net.*.nupkg" -ErrorAction SilentlyContinue)) {
+        Write-Stderr "error: cannot find winfsp.net.*.nupkg"
+        exit 1
+    }
+
    # check winfsp.nupkg
-    if (!(Test-Path "$ProjectRoot\build\VStudio\build\Release\winfsp*.nupkg" -ErrorAction SilentlyContinue)) {
-        Write-Stderr "error: cannot find winfsp*.nupkg"
+    if (!(Test-Path "$ProjectRoot\build\VStudio\build\Release\winfsp.*.nupkg" -ErrorAction SilentlyContinue)) {
+        Write-Stderr "error: cannot find winfsp.*.nupkg"
        exit 1
    }

@ -324,7 +330,7 @@ function Make-ChocoRelease {
        Check-Assets

        Push-Location "$ProjectRoot\build\VStudio\build\Release"
-        choco push
+        choco push (Resolve-Path winfsp.[0-9]*.nupkg)
        if ($LastExitCode -ne 0) {
            Write-Stderr "error: cannot push to Chocolatey"
            exit 1