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

Upgrade to latest .NET Framework #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Upgrade to latest .NET Framework #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66f57c7
Fix solution and add gitignore
afaq-khan Oct 28, 2023
d941830
Upgrade project to 4.8
afaq-khan Oct 28, 2023
29592c3
Delete bin and obj folders
afaq-khan Oct 28, 2023
1513e40
Add multithreading
afaq-khan Oct 31, 2023
f4594e4
Add wix project to replace old vdproj project
afaq-khan Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
402 changes: 402 additions & 0 deletions .gitignore
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions BJ CA Setup/BJ CA Setup.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project Sdk="WixToolset.Sdk/4.0.2">
<PropertyGroup>
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
</PropertyGroup>
</Project>
8 changes: 8 additions & 0 deletions BJ CA Setup/Package.en-us.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!--
This file contains the declaration of all the localizable strings.
-->
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">

<String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />

</WixLocalization>
63 changes: 63 additions & 0 deletions BJ CA Setup/Package.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>

<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Manufacturer="MGP's BJ CA"
ProductCode="{cdbc4de0-5ffe-4a97-99f8-39f8cbd2477c}"
Name="MGP's BJ CA"
Version="1.0.0"
UpgradeCode="{F1794F78-CFB1-4056-A1F7-DA48B956456C}"
InstallerVersion="200">
<Icon Id="BJCA.ico" SourceFile="..\BJ CA\bin\BJCA.ico" />

<StandardDirectory Id="TARGETDIR">
<Directory Id="ProgramMenuFolder">
<Directory Id="ProgramMenuDir" Name="MGP's BJ CA" />
</Directory>
<Directory Id="ProgramFiles64Folder">
<Directory Id="INSTALLDIR" Name="MGP's BJ CA">
<Component Id="MainExecutable" Guid="{1B8CD459-FB86-42B1-8A42-B4D9848179DD}">
<File Id="BJCAExecutable" Source="..\BJ CA\bin\BJ CA.exe">
<Shortcut Id="startmenuShortcut" Directory="ProgramMenuDir" Icon="BJCA.ico" IconIndex="0"
WorkingDirectory="INSTALLDIR" Name="MGP's BJ CA" Advertise="yes" />
<Shortcut Id="desktopShortcut" Directory="DesktopFolder" Icon="BJCA.ico" IconIndex="0"
WorkingDirectory="INSTALLDIR" Name="MGP's BJ CA" Advertise="yes" />
</File>
<RemoveFolder Id='RemoveProgramMenuDir' Directory='ProgramMenuDir' On='uninstall' />
</Component>

<Component Id="BJCAConfigFile">
<File Id="BJCAConfig" Source="..\BJ CA\bin\BJ CA.exe.config" />
</Component>

<Component Id="BJCAXMLFile">
<File Id="BJCAXML" Source="..\BJ CA\bin\BJ CA.xml" />
</Component>

<Component Id="InteropExcelDLLFile">
<File Id="InteropExcelDLL" Source="..\BJ CA\bin\Interop.Excel.dll" />
</Component>

<Component Id="InteropOfficeCoreDLLFile">
<File Id="InteropOfficeCoreDLL" Source="..\BJ CA\bin\Interop.Microsoft.Office.Core.dll" />
</Component>

<Component Id="BJCAResultsXLSFile">
<File Id="BJCAResultsXLS" Source="..\BJ CA\bin\MGPs BJ CA Results.xls" />
</Component>
</Directory>
</Directory>
</StandardDirectory>

<Feature Id="Complete" Level="1">
<ComponentRef Id="MainExecutable" />
<ComponentRef Id="BJCAConfigFile" />
<ComponentRef Id="BJCAXMLFile" />
<ComponentRef Id="InteropExcelDLLFile" />
<ComponentRef Id="InteropOfficeCoreDLLFile" />
<ComponentRef Id="BJCAResultsXLSFile" />
</Feature>

<Media Id="1" EmbedCab="yes" Cabinet="cab1.cab" />
<SummaryInformation Description="MGP's BJ CA Installer" />
</Package>
</Wix>
47 changes: 42 additions & 5 deletions BJ CA.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,60 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Basic Express 2008
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34202.233
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BJ CA", "BJ CA\BJ CA.vbproj", "{4C4D3154-9016-4790-BDA5-FD96D2847DB2}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BJCA Setup", "BJCA Setup\BJCA Setup.vdproj", "{3C3689EA-B29E-46C9-AC4B-279039A30076}"
Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "BJ CA Setup", "BJ CA Setup\BJ CA Setup.wixproj", "{E2E52EBD-B239-4033-8653-DB656D1AC49B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|ARM64.Build.0 = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|x64.ActiveCfg = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|x64.Build.0 = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|x86.ActiveCfg = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Debug|x86.Build.0 = Debug|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|Any CPU.Build.0 = Release|Any CPU
{3C3689EA-B29E-46C9-AC4B-279039A30076}.Debug|Any CPU.ActiveCfg = Debug
{3C3689EA-B29E-46C9-AC4B-279039A30076}.Release|Any CPU.ActiveCfg = Release
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|ARM64.ActiveCfg = Release|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|ARM64.Build.0 = Release|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|x64.ActiveCfg = Release|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|x64.Build.0 = Release|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|x86.ActiveCfg = Release|Any CPU
{4C4D3154-9016-4790-BDA5-FD96D2847DB2}.Release|x86.Build.0 = Release|Any CPU
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|Any CPU.ActiveCfg = Debug|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|Any CPU.Build.0 = Debug|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|ARM64.ActiveCfg = Debug|ARM64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|ARM64.Build.0 = Debug|ARM64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|x64.ActiveCfg = Debug|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|x64.Build.0 = Debug|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|x86.ActiveCfg = Debug|x86
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Debug|x86.Build.0 = Debug|x86
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|Any CPU.ActiveCfg = Release|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|Any CPU.Build.0 = Release|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|ARM64.ActiveCfg = Release|ARM64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|ARM64.Build.0 = Release|ARM64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|x64.ActiveCfg = Release|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|x64.Build.0 = Release|x64
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|x86.ActiveCfg = Release|x86
{E2E52EBD-B239-4033-8653-DB656D1AC49B}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B775D605-9590-4C2A-9B97-27D2A3AA5B8F}
EndGlobalSection
EndGlobal
55 changes: 32 additions & 23 deletions BJ CA/BJ CA.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
Expand Down Expand Up @@ -26,8 +26,8 @@
<FileUpgradeFlags>
</FileUpgradeFlags>
<MyType>WindowsFormsWithCustomSubMain</MyType>
<OldToolsVersion>0.0</OldToolsVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl>
Expand All @@ -45,6 +45,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\</OutputPath>
Expand All @@ -62,8 +63,9 @@
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>1</WarningLevel>
<NoWarn>42016,42017,42018,42019,42032</NoWarn>
<NoWarn>42016,42017,42018,42019,42032,42353,42354,42355</NoWarn>
<DebugType>full</DebugType>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\</OutputPath>
Expand All @@ -81,10 +83,21 @@
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>1</WarningLevel>
<NoWarn>42016,42017,42018,42019,42032</NoWarn>
<NoWarn>42016,42017,42018,42019,42032,42353,42354,42355</NoWarn>
<DebugType>none</DebugType>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>libs\Interop.Excel.dll</HintPath>
</Reference>
<Reference Include="Interop.Microsoft.Office.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>libs\Interop.Microsoft.Office.Core.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
Expand All @@ -106,20 +119,6 @@
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
<COMReference Include="Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>3</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
</COMReference>
<COMReference Include="Office">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>1</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
</COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
Expand Down Expand Up @@ -226,7 +225,16 @@
<Compile Include="TestClass.vb">
<SubType>Code</SubType>
</Compile>
<Content Include="BJCA.ico" />
<Content Include="BJCA.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="app.config" />
<None Include="Interop.Excel.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Interop.Microsoft.Office.Core.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<EmbeddedResource Include="BJCAAboutForm.resx">
<DependentUpon>BJCAAboutForm.vb</DependentUpon>
</EmbeddedResource>
Expand All @@ -241,6 +249,7 @@
</EmbeddedResource>
<EmbeddedResource Include="BJCAResultsForm.resx">
<DependentUpon>BJCAResultsForm.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="BJCASmallRealTimeForm.resx">
<DependentUpon>BJCASmallRealTimeForm.vb</DependentUpon>
Expand All @@ -251,10 +260,10 @@
<None Include="ManualNotes.vb">
<SubType>Code</SubType>
</None>
<None Include="TempStorage.vb">
<SubType>Code</SubType>
<None Include="MGPs BJ CA Results.xls">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ToDoList.vb">
<None Include="TempStorage.vb">
<SubType>Code</SubType>
</None>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion BJ CA/BJ CA.vbproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
<PropertyGroup>
<LastOpenVersion>7.10.3077</LastOpenVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
57 changes: 31 additions & 26 deletions BJ CA/BJCA.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Imports System.Threading.Tasks
Imports BJ_CA.BJCAShared

<Serializable()> Public Class BJCA
Expand Down Expand Up @@ -7826,32 +7827,36 @@ Imports BJ_CA.BJCAShared

#Region " Output Methods "

Public Sub PrintToExcel()
Dim oexcel As New Excel.Application
Dim oexcelbook As Excel.Workbook

Try
oexcel = GetObject(, "Exel.Application")
Try
oexcelbook = oexcel.Workbooks(ExcelFilePath)
Catch
oexcelbook = oexcel.Workbooks.Open(ExcelFilePath)
End Try
Catch
oexcelbook = oexcel.Workbooks.Open(ExcelFilePath)
End Try
PrintStrategiesExcel(oexcelbook)
PrintSplitEVsExcel(oexcelbook)
PrintGameEVsExcel(oexcelbook)
PrintStrategyEVsExcel(oexcelbook)
PrintExceptionsExcel(oexcelbook)
PrintRulesExcel(oexcelbook)

oexcelbook.Worksheets("Strategy Table").Select()

oexcel.Visible = True
oexcelbook = Nothing
oexcel = Nothing
Public Async Sub PrintToExcel()
Await Task.Run(Sub()
Dim oexcel As New Excel.Application
Dim oexcelbook As Excel.Workbook

Try
oexcel = GetObject(, "Exel.Application")
Try
oexcelbook = oexcel.Workbooks(ExcelFilePath)
Catch
oexcelbook = oexcel.Workbooks.Open(ExcelFilePath)
End Try
Catch
oexcelbook = oexcel.Workbooks.Open(ExcelFilePath)
End Try

PrintStrategiesExcel(oexcelbook)
PrintSplitEVsExcel(oexcelbook)
PrintGameEVsExcel(oexcelbook)
PrintStrategyEVsExcel(oexcelbook)
PrintExceptionsExcel(oexcelbook)
PrintRulesExcel(oexcelbook)

oexcelbook.Worksheets("Strategy Table").Select()

oexcel.Visible = True
oexcelbook = Nothing
oexcel = Nothing

End Sub)
End Sub

Private Sub PrintStrategiesExcel(ByVal workBook As Excel.Workbook)
Expand Down
Loading