sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed project and solution so VssApi builds correctly for .NET 5.0

pull/267/head
dahall 2021-12-12 12:57:23 -07:00
parent b7e26fcfd7
commit 79703bd285
6 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PInvoke/VssApi/VsBackup.cpp
View File

@ -100,7 +100,7 @@ namespace Vanara { namespace PInvoke { namespace VssApi {
::HRESULT hr, hrApp;
SafeComPtr<::IVssBackupComponentsEx3*> p = pNative;
Utils::ThrowIfFailed(p->GetWriterStatusEx(i, &id, &wri, &swri, &stat, &hr, &hrApp, &msg));
VssWriterStatus ret{ Utils::FromGUID(id), Utils::FromGUID(wri), swri, static_cast<VSS_WRITER_STATE>(stat), (HRESULT)hr, (HRESULT)hrApp, msg };
VssWriterStatus ret { msg, swri, (HRESULT)hrApp, (HRESULT)hr, Utils::FromGUID(id), Utils::FromGUID(wri), static_cast<VSS_WRITER_STATE>(stat) };
return ret;
}

2
PInvoke/VssApi/VsWriter.cpp
View File

@ -103,7 +103,7 @@ VssRestoreSubcomponent CVssComponent::GetRestoreSubcomponentsItem(int i)
SafeBSTR path, n;
bool repair;
Utils::ThrowIfFailed(pNative->GetRestoreSubcomponent(i, &path, &n, &repair));
VssRestoreSubcomponent e = { repair, n, path };
VssRestoreSubcomponent e = { n, path, repair };
return e;
}

28
PInvoke/VssApi/VssApi.vcxproj
View File

@ -75,7 +75,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>Vanara.PInvoke.VssApi</TargetName>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -83,9 +83,12 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>$(SolutionDir)PInvoke\VssApiMgd\bin\$(ConfigurationName)\$(TargetFramework);%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>vssapi.lib</AdditionalDependencies>
<AddModuleNamesToAssembly>
</AddModuleNamesToAssembly>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -147,29 +150,6 @@
<ClCompile Include="VssFactory.cpp" />
<ClCompile Include="VsWriter.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="app.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="app.ico" />
</ItemGroup>
<ItemGroup>
<Reference Include="Vanara.Core">
<HintPath>..\..\..\..\GitHubRepos\Vanara\PInvoke\VssApi\bin\Debug\net5.0\Vanara.Core.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="Vanara.PInvoke.Shared">
<HintPath>..\..\..\..\GitHubRepos\Vanara\PInvoke\VssApi\bin\Debug\net5.0\Vanara.PInvoke.Shared.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="Vanara.PInvoke.VssApi">
<HintPath>..\..\..\..\GitHubRepos\Vanara\PInvoke\VssApi\bin\Debug\net5.0\Vanara.PInvoke.VssApi.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

10
PInvoke/VssApi/VssApi.vcxproj.filters
View File

@ -69,16 +69,6 @@
<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="$(MSBuildThisFileDirectory)docs\icons\Vanara64x64.png">
<Filter>Resource Files</Filter>

4
PInvoke/VssApi/pch.h
View File

@ -20,4 +20,8 @@
#include "Utils.h"
#include "Macros.h"
#using <Vanara.Core.dll>
#using <Vanara.PInvoke.Shared.dll>
#using <Vanara.PInvoke.VssApiMgd.dll>
#endif //PCH_H

3
Vanara.sln
View File

@ -338,6 +338,9 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vanara.PInvoke.VssApiMgd", "PInvoke\VssApiMgd\Vanara.PInvoke.VssApiMgd.csproj", "{39AEDD51-C627-41B9-96D3-44F481ED4E7C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vanara.PInvoke.VssApi", "PInvoke\VssApi\VssApi.vcxproj", "{11EF8FFF-25DE-4ADB-A951-FA10A421FFE4}"
ProjectSection(ProjectDependencies) = postProject
{39AEDD51-C627-41B9-96D3-44F481ED4E7C} = {39AEDD51-C627-41B9-96D3-44F481ED4E7C}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution