UCS/UCS_schermsoftware
2
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fixed x64 release build

Browse Source
This commit is contained in:
Martijn Scheepers
2021-06-24 14:33:25 +02:00
parent 6d489c36fc
commit 1342a1eb23
13 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UCS.BACnet.TestServer/UCS.BACnet.TestServer.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
UCS.BACnet.UnitTest/UCS.BACnet.UnitTest.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>

2
UCS.BACnet/UCS.BACnet.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
UCS.ConfigFile.UnitTest/UCS.ConfigFile.UnitTest.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>

2
UCS.ConfigFile/UCS.ConfigFile.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
UCS.IOTServer.UnitTest/UCS.IOTServer.UnitTest.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>

2
UCS.IOTServer/UCS.IOTServer.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
UCS.Stentofon.UnitTest/UCS.Stentofon.UnitTest.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>

2
UCS.Stentofon/UCS.Stentofon.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
UCS.Telemetry/UCS.Telemetry.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
UCS.UnitTest/UCS.UnitTest.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.4\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>

107
UCS/UCS.vbproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
@@ -107,46 +107,46 @@
<CodeAnalysisRuleSet>UCS.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\x86\Debug\</OutputPath>
<BaseAddress>285212672</BaseAddress>
<DocumentationFile>
</DocumentationFile>
<WarningLevel>1</WarningLevel>
<NoWarn>
</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
<WarningsAsErrors>
</WarningsAsErrors>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>UCS.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<DefineTrace>false</DefineTrace>
<OutputPath>bin\x86\Release\</OutputPath>
<BaseAddress>285212672</BaseAddress>
<DocumentationFile>
</DocumentationFile>
<Optimize>true</Optimize>
<WarningLevel>1</WarningLevel>
<NoWarn>
</NoWarn>
<PlatformTarget>x86</PlatformTarget>
<WarningsAsErrors>
</WarningsAsErrors>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>UCS.ruleset</CodeAnalysisRuleSet>
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
</PropertyGroup>
<!--<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\x86\Debug\</OutputPath>
<BaseAddress>285212672</BaseAddress>
<DocumentationFile>
</DocumentationFile>
<WarningLevel>1</WarningLevel>
<NoWarn>
</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
<WarningsAsErrors>
</WarningsAsErrors>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>UCS.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>-->
<!--<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<DefineTrace>false</DefineTrace>
<OutputPath>bin\x86\Release\</OutputPath>
<BaseAddress>285212672</BaseAddress>
<DocumentationFile>
</DocumentationFile>
<Optimize>true</Optimize>
<WarningLevel>1</WarningLevel>
<NoWarn>
</NoWarn>
<PlatformTarget>x86</PlatformTarget>
<WarningsAsErrors>
</WarningsAsErrors>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>UCS.ruleset</CodeAnalysisRuleSet>
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
</PropertyGroup>-->
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
@@ -175,6 +175,7 @@
<WarningLevel>1</WarningLevel>
<CodeAnalysisRuleSet>UCS.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\x64\Release\</OutputPath>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
@@ -693,6 +694,10 @@
</COMReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\UCS.ConfigFile\UCS.ConfigFile.csproj">
<Project>{a1cd8042-0df0-4afa-ab88-9d0389321288}</Project>
<Name>UCS.ConfigFile</Name>
</ProjectReference>
<ProjectReference Include="..\UCS.Telemetry\UCS.Telemetry.csproj">
<Project>{f748442a-4dc8-4c16-a592-b55eecb15c28}</Project>
<Name>UCS.Telemetry</Name>
@@ -701,10 +706,6 @@
<Project>{8a88a5cc-08af-46b5-92b4-433ea7614103}</Project>
<Name>UCS.BACnet</Name>
</ProjectReference>
<ProjectReference Include="..\UCS.ConfigFile\UCS.ConfigFile.csproj">
<Project>{a1cd8042-0df0-4afa-ab88-9d0389321288}</Project>
<Name>UCS.ConfigFile</Name>
</ProjectReference>
<ProjectReference Include="..\UCS.IOTServer\UCS.IOTServer.csproj">
<Project>{c4b62d9f-5465-45c9-b845-74fc22c6fc94}</Project>
<Name>UCS.IOTServer</Name>
@@ -716,13 +717,15 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PreBuildEvent>echo PREBUILDSTEP for $(ProjectName)
git rev-parse --short HEAD &gt; "$(ProjectDir)\Version\Commit.txt"
git log -1 --pretty=format:"%25%25cd" --date=format:"%25%25d-%25%25m-%25%25Y %25%25H:%25%25M:%25%25S" &gt; "$(ProjectDir)\Version\CommitDate.txt"
git describe --tags --dirty &gt; "$(ProjectDir)\Version\Tag.txt"
git log --pretty=format:"%25%25ad - %25%25d %25%25s" --date=format:"%25%25d-%25%25m-%25%25Y %25%25H:%25%25M:%25%25S" &gt; "$(ProjectDir)\Version\changelog.txt"
git describe --abbrev=0 &gt;"$(ProjectDir)\Version\ShortTag.txt"
git branch --show-current &gt; "$(ProjectDir)\Version\Branch.txt"</PreBuildEvent>
<PreBuildEvent>
echo PREBUILDSTEP for $(ProjectName)
git rev-parse --short HEAD &gt; "$(ProjectDir)\Version\Commit.txt"
git log -1 --pretty=format:"%25%25cd" --date=format:"%25%25d-%25%25m-%25%25Y %25%25H:%25%25M:%25%25S" &gt; "$(ProjectDir)\Version\CommitDate.txt"
git describe --tags --dirty &gt; "$(ProjectDir)\Version\Tag.txt"
git log --pretty=format:"%25%25ad - %25%25d %25%25s" --date=format:"%25%25d-%25%25m-%25%25Y %25%25H:%25%25M:%25%25S" &gt; "$(ProjectDir)\Version\changelog.txt"
git describe --abbrev=0 &gt;"$(ProjectDir)\Version\ShortTag.txt"
git branch --show-current &gt; "$(ProjectDir)\Version\Branch.txt"
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>

3
UCSInstaller/UCSInstaller.wixproj
View File

@@ -21,8 +21,9 @@
<CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
<CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
</PropertyGroup>
<ItemGroup>
<Compile Include="Product.wxs" />