diff --git a/Directory.Build.targets b/Directory.Build.targets index bdab436d687a32b3af1588a460a7d23e7f92803d..6df02efa59978ace0207aa9e56cc04b1f7df8d58 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -76,13 +76,13 @@ <UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/> <ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/> - <HashingTool Include="$(SolutionDir)HashingTool\bin\Release\$(TargetFramework)\HashingTool.exe"/> - <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\$(TargetFramework)\hashingcmd.exe"/> + <HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\HashingTool.exe"/> + <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\hashingcmd.exe"/> <VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/> - <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\$(TargetFramework)\VECTOMultistage.exe*"/> - <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\$(TargetFramework)\*.dll"/> + <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\VECTOMultistage.exe*"/> + <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\*.dll"/> </ItemGroup> <Message Text="@(VectoCommandLine)"/> diff --git a/HashingCmd/HashingCmd.csproj b/HashingCmd/HashingCmd.csproj index a2b0b8f2ace204feb6fe1d638960b25dea932b5c..94e80f5c60b7c53974cc28f05325d2cc888fd911 100644 --- a/HashingCmd/HashingCmd.csproj +++ b/HashingCmd/HashingCmd.csproj @@ -9,18 +9,9 @@ <AssemblyName>hashingcmd</AssemblyName> <DefineConstants /> <OutputType>Exe</OutputType> + <TargetFrameworks>net45;net48;net5.0</TargetFrameworks> </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" /> <ProjectReference Include="..\VectoCommon\VectoHashing\VectoHashing.csproj" /> diff --git a/HashingTool/HashingTool.csproj b/HashingTool/HashingTool.csproj index 15c07ae30237721fb199d33acc99cd8f2cfecf26..f81b719255d1c3e12aa6f5f62787e44b767c1428 100644 --- a/HashingTool/HashingTool.csproj +++ b/HashingTool/HashingTool.csproj @@ -10,6 +10,7 @@ <AssemblyName>HashingTool</AssemblyName> <DefineConstants /> <UseWPF>true</UseWPF> + <TargetFrameworks>net45;net48;net5.0-windows</TargetFrameworks> </PropertyGroup> <ItemGroup> diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj index f71f1d540e54c59b40934befd21ab6a162d977f5..82f960b47601ab0d3d09b9fe4d9609ca30be0e2f 100644 --- a/VECTO3GUI2020/VECTO3GUI2020.csproj +++ b/VECTO3GUI2020/VECTO3GUI2020.csproj @@ -20,16 +20,15 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" /> + <PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" NoWarn="NU1701" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" /> - <PackageReference Include="Microsoft.Maps.MapControl.WPF" Version="1.0.0.3" /> <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" /> - <PackageReference Include="Microsoft.WindowsAPICodePack-Core" Version="1.1.0.2" /> - <PackageReference Include="Microsoft.WindowsAPICodePack-Shell" Version="1.1.0" /> - <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" /> + <PackageReference Include="Microsoft.WindowsAPICodePack-Core" Version="1.1.0.2" NoWarn="NU1701" /> + <PackageReference Include="Microsoft.WindowsAPICodePack-Shell" Version="1.1.0" NoWarn="NU1701" /> + <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" NoWarn="NU1701" /> <PackageReference Include="Ninject" Version="3.3.4" /> <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" /> - <PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" /> + <PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" NoWarn="NU1701" /> <PackageReference Include="System.Reactive" Version="5.0.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" /> </ItemGroup> diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj index 20da3429688837290f0fd2d7f80ebbad5126ce8c..874d9a7474be3796becf2c8b45a776ce7fc4d44a 100644 --- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj +++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj @@ -4,7 +4,7 @@ <RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace> <AssemblyName>ModelbasedTests</AssemblyName> <DefineConstants /> - <TargetFrameworks>net5.0</TargetFrameworks> + <TargetFrameworks>net5.0-windows</TargetFrameworks> </PropertyGroup> <ItemGroup> diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index ef035eb22ec67f57ca20deded23cbdae7d4bbe2f..9126ebc0188e693233e45742442b7dcbb028857d 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -4,7 +4,7 @@ <RootNamespace>TUGraz.VectoCore.Tests</RootNamespace> <AssemblyName>VectoCoreTest</AssemblyName> <DefineConstants /> - <TargetFrameworks>net5.0</TargetFrameworks> + <TargetFrameworks>net5.0-windows</TargetFrameworks> </PropertyGroup> <ItemGroup>