Add assembly

nadavWeisler · Oct 8, 2020 · 2e22238 · 2e22238
1 parent d6fe33c
commit 2e22238
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/PopUp_Researcher/$this.Icon.ico b/PopUp_Researcher/$this.Icon.ico
diff --git a/PopUp_Researcher/BrmsForm.cs b/PopUp_Researcher/BrmsForm.cs
@@ -4,8 +4,8 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using BrmsGeneratorResearcher.Helpers;
+using BrmsGeneratorResearcher.Models;
 using BrmsGeneratorResearcher.Resources;
-using PopUp_Researcher.Models;
 
 namespace BrmsGeneratorResearcher
 {

diff --git a/PopUp_Researcher/BrmsGeneratorResearcher.csproj b/PopUp_Researcher/BrmsGeneratorResearcher.csproj
@@ -67,7 +67,11 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>PopUp_Researcher.Program</StartupObject>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>%24this.Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
@@ -365,6 +369,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="%24this.Icon.ico" />
     <Content Include="IMAGES\qMark.png" />
     <None Include="Resources\%24this.Icon.ico" />
     <None Include="Resources\Icon.ico" />

diff --git a/PopUp_Researcher/Helpers/BRmsHelper.cs b/PopUp_Researcher/Helpers/BRmsHelper.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using PopUp_Researcher.Models;
+using BrmsGeneratorResearcher.Models;
 
 namespace BrmsGeneratorResearcher.Helpers
 {

diff --git a/PopUp_Researcher/MainForm.cs b/PopUp_Researcher/MainForm.cs
@@ -5,8 +5,6 @@
 using BrmsGeneratorResearcher.Models;
 using BrmsGeneratorResearcher.Resources;
 using Newtonsoft.Json;
-using PopUp_Researcher;
-using PopUp_Researcher.Models;
 using Formatting = Newtonsoft.Json.Formatting;
 
 namespace BrmsGeneratorResearcher

diff --git a/PopUp_Researcher/Models/Experiment.cs b/PopUp_Researcher/Models/Experiment.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using BrmsGeneratorResearcher.Helpers;
-using PopUp_Researcher.Models;
 
 namespace BrmsGeneratorResearcher.Models
 {

diff --git a/PopUp_Researcher/Models/bRMS.cs b/PopUp_Researcher/Models/bRMS.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using BrmsGeneratorResearcher.Helpers;
 
-namespace PopUp_Researcher.Models
+namespace BrmsGeneratorResearcher.Models
 {
     public class Brms: Trial
     {

diff --git a/PopUp_Researcher/Program.cs b/PopUp_Researcher/Program.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Windows.Forms;
-using BrmsGeneratorResearcher;
 
-namespace PopUp_Researcher
+namespace BrmsGeneratorResearcher
 {
     static class Program
     {

diff --git a/PopUp_Researcher/QuestionForm.Designer.cs b/PopUp_Researcher/QuestionForm.Designer.cs
diff --git a/PopUp_Researcher/QuestionForm.cs b/PopUp_Researcher/QuestionForm.cs
@@ -5,7 +5,7 @@
 using System.Windows.Forms;
 using BrmsGeneratorResearcher.Helpers;
 
-namespace PopUp_Researcher
+namespace BrmsGeneratorResearcher
 {
     public partial class QuestionForm : Form
     {

diff --git a/PopUp_Researcher/SurveyForm.cs b/PopUp_Researcher/SurveyForm.cs
@@ -3,7 +3,6 @@
 using System.Windows.Forms;
 using BrmsGeneratorResearcher.Helpers;
 using BrmsGeneratorResearcher.Resources;
-using PopUp_Researcher;
 
 namespace BrmsGeneratorResearcher
 {