Skip to content

Commit b6fbd6b

Browse files
cgallredcgallred
authored
Merge pull request #78 from yerudako/user/yerudako/fix-build-to-run-on-windows-2022
Update build script and targeting nugets to allow the project to build on the windows-2022 image
2 parents e0eef67 + 27b17b3 commit b6fbd6b

File tree

7 files changed

+19
-21
lines changed

7 files changed

+19
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{4E5F40B3-B56F-4B62-92CB-68E7E0E36AFA}</ProjectGuid>
5-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
5+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
66
<CLRSupport>true</CLRSupport>
77
</PropertyGroup>
88
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎ProjectedFSLib.Managed.API/ProjectedFSLib.Managed.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
<CodeAnalysisRuleSet>MixedRecommendedRules.ruleset</CodeAnalysisRuleSet>
4949
<RunCodeAnalysis>true</RunCodeAnalysis>
5050
<TargetName>ProjectedFSLib.Managed</TargetName>
51-
<IncludePath>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362\um;$(IncludePath)</IncludePath>
51+
<IncludePath>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041\um;$(IncludePath)</IncludePath>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5454
<LinkIncremental>false</LinkIncremental>
5555
<CodeAnalysisRuleSet>MixedRecommendedRules.ruleset</CodeAnalysisRuleSet>
5656
<RunCodeAnalysis>false</RunCodeAnalysis>
5757
<TargetName>ProjectedFSLib.Managed</TargetName>
58-
<IncludePath>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\um;$(IncludePath)</IncludePath>
58+
<IncludePath>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um;$(IncludePath)</IncludePath>
5959
</PropertyGroup>
6060
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6161
<ClCompile>
@@ -65,11 +65,11 @@
6565
<WarningLevel>Level4</WarningLevel>
6666
<TreatWarningAsError>true</TreatWarningAsError>
6767
<EnablePREfast>true</EnablePREfast>
68-
<AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\um;$(BuildOutputDir)\$(ProjectName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
68+
<AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um;$(BuildOutputDir)\$(ProjectName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6969
</ClCompile>
7070
<Link>
7171
<AdditionalDependencies>ProjectedFSLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
72-
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.18362.0\um\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
72+
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7373
</Link>
7474
<PreBuildEvent>
7575
<Command>$(ProjectDir)\..\Scripts\CreateVersionHeader.bat $(ProjectName) $(ProjFSManagedVersion) $(SolutionDir) &amp;&amp; $(ProjectDir)\..\Scripts\CreateCliAssemblyVersion.bat $(ProjectName) $(ProjFSManagedVersion) $(SolutionDir)</Command>
@@ -87,11 +87,11 @@
8787
<TreatWarningAsError>true</TreatWarningAsError>
8888
<EnablePREfast>false</EnablePREfast>
8989
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
90-
<AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\um;$(BuildOutputDir)\$(ProjectName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
90+
<AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um;$(BuildOutputDir)\$(ProjectName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9191
</ClCompile>
9292
<Link>
9393
<AdditionalDependencies>ProjectedFSLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
94-
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.18362.0\um\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
94+
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9595
</Link>
9696
<PreBuildEvent>
9797
<Command>$(ProjectDir)\..\Scripts\CreateVersionHeader.bat $(ProjectName) $(ProjFSManagedVersion) $(SolutionDir) &amp;&amp; $(ProjectDir)\..\Scripts\CreateCliAssemblyVersion.bat $(ProjectName) $(ProjFSManagedVersion) $(SolutionDir)</Command>

‎ProjectedFSLib.Managed.Test/ProjectedFSLib.Managed.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(SolutionDir)\ProjectedFSLib.Managed.cs.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<GenerateProgramFile>false</GenerateProgramFile>
88
<PlatformTarget>x64</PlatformTarget>

‎README.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
|Branch|Functional Tests|
44
|:--:|:--:|
5-
|**main**|[![Build status](https://dev.azure.com/projfs/ci/_apis/build/status/PR%20-%20Build%20and%20Functional%20Test%20-%202019?branchName=main)](https://dev.azure.com/projfs/ci/_build/latest?definitionId=5)|
6-
|**release**|[![Build status](https://dev.azure.com/microsoft/OS/_apis/build/status/ProjFS%20CI%20-%20Build,%20Sign,%20Package)](https://dev.azure.com/microsoft/OS/_build/latest?definitionId=37476)|
5+
|**main**|[![Build status](https://dev.azure.com/projfs/ci/_apis/build/status/PR%20-%20Build%20and%20Functional%20Test%20-%202022?branchName=main)](https://dev.azure.com/projfs/ci/_build/latest?definitionId=7)|
6+
77

88
## About ProjFS
99

@@ -50,17 +50,15 @@ coverage of the managed wrapper API surface.
5050

5151
## Building the ProjFS Managed API
5252

53-
* Install [Visual Studio 2019 Community Edition](https://www.visualstudio.com/downloads/) version 16.4 or higher.
53+
* Install [Visual Studio 2022 Community Edition](https://www.visualstudio.com/downloads/).
5454
* Include the following workloads:
5555
* **.NET desktop development**
56-
* **.NET Core cross-platform development**
5756
* **Desktop development with C++**
58-
* Include the following individual components:
59-
* **.NET Framework 4.6.1 SDK**
57+
* Ensure the following individual components are installed:
6058
* **C++/CLI support**
6159
* **Windows 10 SDK (10.0.19041.0)**
6260
* Create a folder to clone into, e.g. `C:\Repos\ProjFS-Managed`
63-
* Clone this repo into the `src` subfolder, e.g. `C:\Repos\ProjFS-Managed\src`
61+
* Clone this repo into a subfolder named `src`, e.g. `C:\Repos\ProjFS-Managed\src`
6462
* Run `src\scripts\BuildProjFS-Managed.bat`
6563
* You can also build in Visual Studio by opening `src\ProjectedFSLib.Managed.sln` and building.
6664

‎scripts/BuildProjFS-Managed.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ SET vswherever=2.8.4
2424
SET vswhere=%PROJFS_PACKAGESDIR%\vswhere.%vswherever%\tools\vswhere.exe
2525
set WINSDK_BUILD=19041
2626
echo Checking for VS installation:
27-
echo %vswhere% -all -prerelease -latest -version "[16.4,17.0)" -products * -requires Microsoft.Component.MSBuild Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.Workload.NativeDesktop Microsoft.VisualStudio.Workload.NetCoreTools Microsoft.VisualStudio.Component.Windows10SDK.%WINSDK_BUILD% Microsoft.VisualStudio.Component.VC.CLI.Support -property installationPath
28-
for /f "usebackq tokens=*" %%i in (`%vswhere% -all -prerelease -latest -version "[16.4,17.0)" -products * -requires Microsoft.Component.MSBuild Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.Workload.NativeDesktop Microsoft.VisualStudio.Workload.NetCoreTools Microsoft.VisualStudio.Component.Windows10SDK.%WINSDK_BUILD% Microsoft.VisualStudio.Component.VC.CLI.Support -property installationPath`) do (
27+
echo %vswhere% -all -prerelease -latest -version "[16.4,18.0)" -products * -requires Microsoft.Component.MSBuild Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.Workload.NativeDesktop Microsoft.VisualStudio.Component.Windows10SDK.%WINSDK_BUILD% Microsoft.VisualStudio.Component.VC.CLI.Support -property installationPath
28+
for /f "usebackq tokens=*" %%i in (`%vswhere% -all -prerelease -latest -version "[16.4,18.0)" -products * -requires Microsoft.Component.MSBuild Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.Workload.NativeDesktop Microsoft.VisualStudio.Component.Windows10SDK.%WINSDK_BUILD% Microsoft.VisualStudio.Component.VC.CLI.Support -property installationPath`) do (
2929
set VsDir=%%i
3030
)
3131

‎scripts/RunTests.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ CALL %~dp0\InitializeEnvironment.bat || EXIT /b 10
44
IF "%1"=="" (SET "Configuration=Debug") ELSE (SET "Configuration=%1")
55

66
set RESULT_FRAMEWORK=0
7-
set TESTDIR=%PROJFS_OUTPUTDIR%\ProjectedFSLib.Managed.Test\bin\AnyCPU\%Configuration%\net461
7+
set TESTDIR=%PROJFS_OUTPUTDIR%\ProjectedFSLib.Managed.Test\bin\AnyCPU\%Configuration%\net48
88
pushd %TESTDIR%
9-
%TESTDIR%\ProjectedFSLib.Managed.Test.exe --params ProviderExe=%PROJFS_OUTPUTDIR%\SimpleProviderManaged\bin\AnyCPU\%Configuration%\net461\SimpleProviderManaged.exe || set RESULT_FRAMEWORK=1
9+
%TESTDIR%\ProjectedFSLib.Managed.Test.exe --params ProviderExe=%PROJFS_OUTPUTDIR%\SimpleProviderManaged\bin\AnyCPU\%Configuration%\net48\SimpleProviderManaged.exe || set RESULT_FRAMEWORK=1
1010
popd
1111

1212
set RESULT_CORE=0

‎simpleProviderManaged/SimpleProviderManaged.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(SolutionDir)\ProjectedFSLib.Managed.cs.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
77
<OutputType>Exe</OutputType>
88
<PlatformTarget>x64</PlatformTarget>
99
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<ProjectReference Condition="'$(TargetFramework)'=='net461'" Include="..\ProjectedFSLib.Managed.API\NetFramework\ProjectedFSLib.Managed.vcxproj" />
20+
<ProjectReference Condition="'$(TargetFramework)'=='net48'" Include="..\ProjectedFSLib.Managed.API\NetFramework\ProjectedFSLib.Managed.vcxproj" />
2121
<ProjectReference Condition="'$(TargetFramework)'=='netcoreapp3.1'" Include="..\ProjectedFSLib.Managed.API\NetCore\ProjectedFSLib.Managed.NetCore.vcxproj" />
2222
</ItemGroup>
2323

0 commit comments

Comments
 (0)