Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RD-FFK-NET8] upgraded projects to sdk style with multitargeting #2

Closed
wants to merge 2 commits into from
Closed

[RD-FFK-NET8] upgraded projects to sdk style with multitargeting #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d681ec4
[RD-FFK-NET8] Added vs folder to ignore + upgraded projects to sdk st…
forna1991 Apr 12, 2024
e450489
[RD-FFK-NET8] Updated csproj for ui project fairmat/dev/fairmatserver…
forna1991 Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/
.vs/

# mstest test results
TestResults
Expand Down
23 changes: 0 additions & 23 deletions ScenarioReduction/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@

using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Scenario Reduction")]
[assembly: AssemblyDescription("Scenario Reduction")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Fairmat SRL")]
[assembly: AssemblyCopyright("Copyright © Fairmat SRL 2009-2013")]
[assembly: AssemblyProduct("Scenario Reduction")]
[assembly: AssemblyTrademark("Fairmat")]
[assembly: AssemblyCulture("")]

Expand All @@ -37,16 +27,3 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("5d4ee326-ec9c-495f-a6fc-7c0eca5ab828")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("1.0.0")]
92 changes: 20 additions & 72 deletions ScenarioReduction/ScenarioReduction.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,109 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{EC4AFD73-6510-4229-83B1-497A1FAD4702}</ProjectGuid>
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>scenario_reduction</RootNamespace>
<AssemblyName>ScenarioReduction</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<StartupObject>
</StartupObject>
<TargetFrameworkProfile />
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<Prefer32Bit>false</Prefer32Bit>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyTitle>Scenario Reduction</AssemblyTitle>
<Description>Scenario Reduction</Description>
<Company>Fairmat SRL</Company>
<Copyright>Copyright © Fairmat SRL 2009-2013</Copyright>
<Product>Scenario Reduction</Product>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="DVPLDOM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="DVPLDOM">
<HintPath>..\..\DVPLReferences\DVPLDOM.dll</HintPath>
</Reference>
<Reference Include="DVPLDOME, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="DVPLDOME">
<HintPath>..\..\DVPLReferences\DVPLDOME.dll</HintPath>
</Reference>
<Reference Include="DVPLI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="DVPLI">
<HintPath>..\..\DVPLReferences\DVPLI.dll</HintPath>
</Reference>
<Reference Include="DVPLInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="DVPLInterfaces">
<HintPath>..\..\DVPLReferences\DVPLInterfaces.dll</HintPath>
</Reference>
<Reference Include="DVPLUtils, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\DVPLUtils.dll</HintPath>
</Reference>
<Reference Include="Mono.Addins, Version=0.6.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\Mono.Addins.dll</HintPath>
</Reference>
<Reference Include="SolverBase, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="SolverBase">
<HintPath>..\..\DVPLReferences\SolverBase.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<Reference Update="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BackwardReduction.cs" />
<Compile Include="ScenarioDescriptiveStatistics.cs" />
<Compile Include="ExpressExporter.cs" />
<Compile Include="MChainTree.cs" />
<Compile Include="MultivariateAR1Tree.cs" />
<Compile Include="MultivariateTree.cs" />
<Compile Include="NormalGenerator.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScenarioReduction.cs" />
<Compile Include="ScenarioTree.cs" />
<Compile Include="SimultaneousBackwardReduction.cs" />
<Compile Include="TreeNode.cs" />
<Compile Include="WTree.cs" />
<Compile Include="XTree.cs" />
<Content Include="documentation.txt" />
</ItemGroup>
<ItemGroup>
<Content Include="documentation.txt" />
<PackageReference Include="Mono.Addins">
<Version>1.4.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
24 changes: 0 additions & 24 deletions ScenarioTreeGenerator.UI/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,7 @@

// This plug-in is also an addin root.
[assembly: Mono.Addins.AddinRoot("ScenarionTreeGenerator", "1.0")]

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Scenario Tree Generator")]
[assembly: AssemblyDescription("Scenario Tree Generator")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Fairmat SRL")]
[assembly: AssemblyCopyright("Copyright © Fairmat SRL 2009-2013")]
[assembly: AssemblyProduct("Scenario Tree Generator")]
[assembly: AssemblyTrademark("Fairmat")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -47,16 +36,3 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("706dc359-e8fe-486d-8491-c4aefcb46940")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.3")]
[assembly: AssemblyFileVersion("1.0.3")]
102 changes: 20 additions & 82 deletions ScenarioTreeGenerator.UI/ScenarioTreeGenerator.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D2945F30-0435-47E8-BF61-E3C25DD850A7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ScenarioTreeGenerator.UI</RootNamespace>
<AssemblyName>ScenarioTreeGenerator.UI</AssemblyName>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<FileUpgradeFlags />
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand All @@ -30,114 +19,63 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<Prefer32Bit>false</Prefer32Bit>
<TargetFramework>net48</TargetFramework>
<AssemblyTitle>Scenario Tree Generator</AssemblyTitle>
<Company>Fairmat SRL</Company>
<Product>Scenario Tree Generator</Product>
<Description>Scenario Tree Generator</Description>
<Copyright>Copyright © Fairmat SRL 2009-2013</Copyright>
<AssemblyVersion>1.0.3</AssemblyVersion>
<FileVersion>1.0.3</FileVersion>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DVPLDOM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\DVPLDOM.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DVPLDOME, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\DVPLDOME.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DVPLI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\DVPLI.dll</HintPath>
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DVPLInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c08731b4bb5a116, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\DVPLInterfaces.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Mono.Addins, Version=0.6.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DVPLReferences\Mono.Addins.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SessionSettings.cs" />
<Compile Include="SGP.cs" />
<Compile Include="SGSettings.cs">
<Compile Update="SGSettings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="SGSettings.Designer.cs">
<Compile Update="SGSettings.Designer.cs">
<DependentUpon>SGSettings.cs</DependentUpon>
</Compile>
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="SGSettings.resx">
<EmbeddedResource Update="SGSettings.resx">
<DependentUpon>SGSettings.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<ProjectReference Include="..\ScenarioReduction\ScenarioReduction.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ScenarioReduction\ScenarioReduction.csproj">
<Project>{EC4AFD73-6510-4229-83B1-497A1FAD4702}</Project>
<Name>ScenarioReduction</Name>
</ProjectReference>
<PackageReference Include="Mono.Addins" Version="1.4.1" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
4 changes: 2 additions & 2 deletions ScenarioTreeGenerator.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScenarioTreeGenerator.UI", "ScenarioTreeGenerator.UI\ScenarioTreeGenerator.UI.csproj", "{D2945F30-0435-47E8-BF61-E3C25DD850A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScenarioReduction", "ScenarioReduction\ScenarioReduction.csproj", "{EC4AFD73-6510-4229-83B1-497A1FAD4702}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScenarioReduction", "ScenarioReduction\ScenarioReduction.csproj", "{EC4AFD73-6510-4229-83B1-497A1FAD4702}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down