Skip to content

Commit 2802250

Browse files
committed
Added setup project
1 parent f9e4031 commit 2802250

File tree

8 files changed

+1161
-15
lines changed

8 files changed

+1161
-15
lines changed

JSonToCSV.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSonToCSV", "JSonToCSV\JSonToCSV.csproj", "{31E3455B-012B-46E5-A3D5-4C2679C761D4}"
77
EndProject
8+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "JSonToCSVSetup", "JSonToCSVSetup\JSonToCSVSetup.vdproj", "{CC567A01-C999-4F17-92DD-FF99C1EE9244}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,8 @@ Global
1517
{31E3455B-012B-46E5-A3D5-4C2679C761D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
1618
{31E3455B-012B-46E5-A3D5-4C2679C761D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
1719
{31E3455B-012B-46E5-A3D5-4C2679C761D4}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{CC567A01-C999-4F17-92DD-FF99C1EE9244}.Debug|Any CPU.ActiveCfg = Debug
21+
{CC567A01-C999-4F17-92DD-FF99C1EE9244}.Release|Any CPU.ActiveCfg = Release
1822
EndGlobalSection
1923
GlobalSection(SolutionProperties) = preSolution
2024
HideSolutionNode = FALSE

JSonToCSV/JSonToCSV.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<StartupObject>JSonToCSV.Program</StartupObject>
3939
</PropertyGroup>
4040
<PropertyGroup>
41-
<ApplicationIcon>Resources\Papirus-Team-Papirus-Mimetypes-App-json.ico</ApplicationIcon>
41+
<ApplicationIcon>App-json.ico</ApplicationIcon>
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<Reference Include="ChoETL, Version=1.1.0.4, Culture=neutral, processorArchitecture=MSIL">

JSonToCSV/JSonToCSV.csproj.user

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<StartArguments>
55
</StartArguments>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<ProjectView>ProjectFiles</ProjectView>
9+
</PropertyGroup>
710
</Project>

JSonToCSV/MainForm.Designer.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

JSonToCSV/MainForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void btnConvert_Click(object sender, EventArgs e)
122122
}
123123
catch (Exception ex)
124124
{
125-
MessageBox.Show($"{ex.Message} {Environment.NewLine} {ex.StackTrace}", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
125+
Program.ShowError(ex);
126126
}
127127
}
128128

JSonToCSV/Properties/Resources.Designer.cs

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

JSonToCSV/Properties/Resources.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@
130130
<data name="list_remove" type="System.Resources.ResXFileRef, System.Windows.Forms">
131131
<value>..\Resources\list-remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132132
</data>
133-
<data name="Papirus_Team_Papirus_Mimetypes_App_json" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>..\Resources\Papirus-Team-Papirus-Mimetypes-App-json.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
135-
</data>
136133
<data name="system_exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
137134
<value>..\Resources\system-exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
138135
</data>

0 commit comments

Comments
 (0)