diff options
Diffstat (limited to 'src/ext/Bal/dnchost')
-rw-r--r-- | src/ext/Bal/dnchost/dnchost.vcxproj | 57 | ||||
-rw-r--r-- | src/ext/Bal/dnchost/packages.config | 9 |
2 files changed, 25 insertions, 41 deletions
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index bef3f77e..6bc89427 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj | |||
@@ -1,12 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
5 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
6 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
7 | <Import Project="..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | ||
8 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
9 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
10 | <ItemGroup Label="ProjectConfigurations"> | 4 | <ItemGroup Label="ProjectConfigurations"> |
11 | <ProjectConfiguration Include="Debug|ARM64"> | 5 | <ProjectConfiguration Include="Debug|ARM64"> |
12 | <Configuration>Debug</Configuration> | 6 | <Configuration>Debug</Configuration> |
@@ -33,6 +27,7 @@ | |||
33 | <Platform>x64</Platform> | 27 | <Platform>x64</Platform> |
34 | </ProjectConfiguration> | 28 | </ProjectConfiguration> |
35 | </ItemGroup> | 29 | </ItemGroup> |
30 | |||
36 | <PropertyGroup Label="Globals"> | 31 | <PropertyGroup Label="Globals"> |
37 | <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> | 32 | <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> |
38 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 33 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
@@ -41,14 +36,18 @@ | |||
41 | <TargetName>dnchost</TargetName> | 36 | <TargetName>dnchost</TargetName> |
42 | <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> |
43 | </PropertyGroup> | 38 | </PropertyGroup> |
39 | |||
44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 40 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
42 | |||
46 | <PropertyGroup> | 43 | <PropertyGroup> |
47 | <NetHostPlatform>$(Platform)</NetHostPlatform> | 44 | <NetHostPlatform>$(Platform)</NetHostPlatform> |
48 | <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform> | 45 | <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform> |
49 | <NetHostPath>..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath> | 46 | <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath> |
47 | <ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath)</ProjectAdditionalIncludeDirectories> | ||
50 | <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries> | 48 | <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries> |
51 | </PropertyGroup> | 49 | </PropertyGroup> |
50 | |||
52 | <ItemGroup> | 51 | <ItemGroup> |
53 | <ClCompile Include="dnchost.cpp" /> | 52 | <ClCompile Include="dnchost.cpp" /> |
54 | <ClCompile Include="dncutil.cpp" /> | 53 | <ClCompile Include="dncutil.cpp" /> |
@@ -56,26 +55,27 @@ | |||
56 | <PrecompiledHeader>Create</PrecompiledHeader> | 55 | <PrecompiledHeader>Create</PrecompiledHeader> |
57 | </ClCompile> | 56 | </ClCompile> |
58 | </ItemGroup> | 57 | </ItemGroup> |
58 | |||
59 | <ItemGroup> | 59 | <ItemGroup> |
60 | <ClInclude Include="coreclrhost.h" /> | 60 | <ClInclude Include="coreclrhost.h" /> |
61 | <ClInclude Include="dnchost.h" /> | 61 | <ClInclude Include="dnchost.h" /> |
62 | <ClInclude Include="dncutil.h" /> | 62 | <ClInclude Include="dncutil.h" /> |
63 | <ClInclude Include="precomp.h" /> | 63 | <ClInclude Include="precomp.h" /> |
64 | </ItemGroup> | 64 | </ItemGroup> |
65 | |||
65 | <ItemGroup> | 66 | <ItemGroup> |
66 | <None Include="dnchost.def" /> | 67 | <None Include="dnchost.def" /> |
67 | </ItemGroup> | 68 | </ItemGroup> |
68 | <ItemGroup> | 69 | |
69 | <None Include="packages.config" /> | ||
70 | </ItemGroup> | ||
71 | <ItemDefinitionGroup> | 70 | <ItemDefinitionGroup> |
72 | <ClCompile> | 71 | <!-- <ClCompile> |
73 | <AdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 72 | <AdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
74 | </ClCompile> | 73 | </ClCompile> --> |
75 | <Link> | 74 | <Link> |
76 | <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> | 75 | <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> |
77 | </Link> | 76 | </Link> |
78 | </ItemDefinitionGroup> | 77 | </ItemDefinitionGroup> |
78 | |||
79 | <ItemGroup> | 79 | <ItemGroup> |
80 | <ProjectReference Include="..\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj"> | 80 | <ProjectReference Include="..\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj"> |
81 | <Project>{0D780900-C2FF-4FA2-8CB5-8A19768724C5}</Project> | 81 | <Project>{0D780900-C2FF-4FA2-8CB5-8A19768724C5}</Project> |
@@ -83,24 +83,15 @@ | |||
83 | <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> | 83 | <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | </ItemGroup> | 85 | </ItemGroup> |
86 | |||
87 | <ItemGroup> | ||
88 | <PackageReference Include="WixToolset.Dutil" /> | ||
89 | <PackageReference Include="WixToolset.BalUtil" /> | ||
90 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
91 | |||
92 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
93 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
94 | </ItemGroup> | ||
95 | |||
86 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 96 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
87 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | 97 | </Project> |
88 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
89 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
90 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
91 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
92 | <PropertyGroup> | ||
93 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | ||
94 | </PropertyGroup> | ||
95 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
96 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
97 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
98 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
99 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
100 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
101 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
102 | <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
103 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
104 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
105 | </Target> | ||
106 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config index 6c369364..78fa970f 100644 --- a/src/ext/Bal/dnchost/packages.config +++ b/src/ext/Bal/dnchost/packages.config | |||
@@ -1,13 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
7 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 3 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> |
8 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 4 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> |
9 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 5 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> |
10 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
11 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
12 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
13 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |