Merge pull request #94 from Sparkiy/edge

Now builds in VS2013
Sparkiy · Feb 14, 2015 · 77e7a3a · 77e7a3a
2 parents 409d1af + 0f6aec5
commit 77e7a3a
Show file tree

Hide file tree

Showing 46 changed files with 409 additions and 145 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Ignore Windows image thumbnails
+Thumbs.db
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

diff --git a/SparkiyClient/SharpDX.Toolkit.Game.Direct2D b/SparkiyClient/SharpDX.Toolkit.Game.Direct2D
diff --git a/SparkiyClient/SparkiyClient.Common/ExtendedViewModel.cs b/SparkiyClient/SparkiyClient.Common/ExtendedViewModel.cs
@@ -82,7 +82,10 @@ public ExtendedObservableObject()
 			base.RaisePropertyChanged(propertyName);
 		}
 
-		public bool IsDirty => this.propertyManager.IsDirty;
+		public bool IsDirty 
+		{ 
+			get { return  this.propertyManager.IsDirty; } 
+		}
 
 		public void MarkAsClean()
 		{
@@ -174,8 +177,8 @@ public PropertyManager(INotifyPropertyChangedTrigger trigger)
 				this.propertyValues[propertyName] = defaultValue;
 			return (T)this.propertyValues[propertyName];
 		}
-		
-		public bool IsDirty => this.isDirty;
+
+		public bool IsDirty { get { return this.isDirty; } }
 
 		public void MarkAsClean()
 		{

diff --git a/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj b/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj
@@ -26,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -52,6 +53,40 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <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|x64' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <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|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
     <TargetPlatform Include="Windows, Version=8.1" />
@@ -101,4 +136,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
@@ -68,7 +68,7 @@ public Project Project
 			set { this.SetProperty(value); }
 		}
 
-		public RelayCommand CreateProjectCommand { get; }
+		public RelayCommand CreateProjectCommand { get; private set; }
 	}
 
 	public sealed class CreateProjectPageViewModelDesignTime : CreateProjectPageViewModel

diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
@@ -53,6 +53,8 @@ public DebugPageViewModel(IProjectService projectService, INavigationService nav
 
 			this.NavigateToHomeCommand = new RelayCommand(this.NavigateToHomeCommandExecute);
 			this.NavigateToEditorCommand = new RelayCommand(this.NavigateToEditorCommandExecute);
+
+			this.OutputMessages = new ObservableCollection<EngineMessage>();
 		}
 
 		public async override void OnNavigatedTo(NavigationEventArgs e)
@@ -85,7 +87,7 @@ private void NavigateToHomeCommandExecute()
 
 		private void MessagesCheckTimerOnTick(object sender, object o)
 		{
-			if (this.projectPlayEngineManager?.Engine == null)
+			if (this.projectPlayEngineManager == null || this.projectPlayEngineManager.Engine == null)
 				return;
 
 			foreach (var engineMessage in this.projectPlayEngineManager.Engine.GetMessages())
@@ -115,14 +117,14 @@ public async Task AssignProjectAsync(Project project)
 		}
 
 
-		public RelayCommand NavigateToEditorCommand { get; }
+		public RelayCommand NavigateToEditorCommand { get; private set; }
 
-		public RelayCommand NavigateToHomeCommand { get; }
+		public RelayCommand NavigateToHomeCommand { get; private set; }
 
 
-		public Project Project => this.project;
+		public Project Project { get { return this.project; } }
 
-		public ObservableCollection<EngineMessage> OutputMessages { get; } = new ObservableCollection<EngineMessage>();
+		public ObservableCollection<EngineMessage> OutputMessages { get; private set; }
 	}
 
 	public sealed class DebugPageViewModelDesignTime : DebugPageViewModel

diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
@@ -199,7 +199,7 @@ public CodeFile SelectedFile
 				if (this.SelectedFile == value)
 					return;
 
-				if (this.SelectedFile != null && this.editor?.Code != null)
+				if (this.SelectedFile != null && this.editor != null && this.editor.Code != null)
 				{
 					Log.Debug("Assigning code from editor to file \"{0}\"", this.SelectedFile.Name);
 					this.SelectedFile.Code = this.editor.Code ?? String.Empty;
@@ -210,28 +210,28 @@ public CodeFile SelectedFile
 				if (this.SelectedFile != null && editor != null)
 				{
 					Log.Debug("Assigning code from file \"{0}\" to editor", this.SelectedFile.Name);
-					this.editor.Code = this.SelectedFile.Code?.TrimEnd('\r', '\n') + "\r" ?? String.Empty;
+					this.editor.Code = this.SelectedFile.Code != null ? this.SelectedFile.Code.TrimEnd('\r', '\n') + "\r" : String.Empty;
 				}
 			}
 		}
 
-		public RelayCommand AddNewFileCommand { get; }
+		public RelayCommand AddNewFileCommand { get; private set; }
 
 		public INewFileViewModel NewFileViewModel
 		{
 			get { return this.GetProperty<INewFileViewModel>(); }
 			protected set { this.SetProperty(value); }
 		}
 
-		public RelayCommand AddNewAssetCommand { get; }
+		public RelayCommand AddNewAssetCommand { get; private set; }
 
-		public RelayCommand NavigateToHomeCommand { get; }
+		public RelayCommand NavigateToHomeCommand { get; private set; }
 
-		public RelayCommand NavigateToProjectCommand { get; }
+		public RelayCommand NavigateToProjectCommand { get; private set; }
 
-		public RelayCommand DebugProjectCommand { get; }
+		public RelayCommand DebugProjectCommand { get; private set; }
 
-		public RelayCommand PlayProjectCommand { get; }
+		public RelayCommand PlayProjectCommand { get; private set; }
 	}
 
 	public sealed class EditPageViewModelDesignTime : EditPageViewModel

diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs b/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs
@@ -55,7 +55,7 @@ public async Task ImportAsset(Project project, StorageFile file)
 			if (asset != null)
 				project.Assets.Add(asset);
 
-			Log.Debug("Asset \"{0}\" imported.", asset?.Name ?? "<INVALID TYPE>");
+			Log.Debug("Asset \"{0}\" imported.", asset != null ? asset.Name : "<INVALID TYPE>");
 		}
 
 		private Asset ResolveAsset(StorageFile file)
@@ -105,7 +105,7 @@ public async Task SaveAsync()
 			Log.Debug("Saving projects...");
 
 			// Retrieve all dirty projects
-			var dirtyProjects = this.projects.Where(p => p.IsDirty || (p.Files?.Any(s => s.IsDirty) ?? false));
+			var dirtyProjects = this.projects.Where(p => p.IsDirty || (p.Files != null ? p.Files.Any(s => s.IsDirty) : false));
 			foreach (var dirtyProject in dirtyProjects)
 			{
 				// Create project folder if it doesnt exist or retrieve one from project files path
@@ -122,17 +122,22 @@ public async Task SaveAsync()
 
 				// Save all dirty files
 				var scriptsFolder = await projectFolder.GetFolderAsync(ProjectFilesPath);
-				var dirtyFiles = dirtyProject.Files?.Where(s => s.IsDirty);
-				if (dirtyFiles != null)
-					foreach (var script in dirtyFiles)
+				if (dirtyProject.Files != null)
+				{
+					var dirtyFiles = dirtyProject.Files.Where(s => s.IsDirty);
+					if (dirtyFiles != null)
 					{
-						await SaveFileSafeAsync(
-							scriptsFolder, 
-							script.Name, 
-							script is Script ? ProjectFilesScriptExtension : ProjectFilesClassExtension, 
-							script.Code ?? String.Empty);
-						script.MarkAsClean();
+						foreach (var script in dirtyFiles)
+						{
+							await SaveFileSafeAsync(
+								scriptsFolder,
+								script.Name,
+								script is Script ? ProjectFilesScriptExtension : ProjectFilesClassExtension,
+								script.Code ?? String.Empty);
+							script.MarkAsClean();
+						}
 					}
+				}
 
 				dirtyProject.MarkAsClean();
 

diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/StorageService.cs b/SparkiyClient/SparkiyClient.UILogic/Services/StorageService.cs
@@ -83,6 +83,6 @@ public async Task SaveFileSafeAsync(
 		/// <summary>
 		/// The workspace folder
 		/// </summary>
-		public StorageFolder WorkspaceFolder => this.workspaceFolder;
+		public StorageFolder WorkspaceFolder { get { return this.workspaceFolder; } }
 	}
 }
diff --git a/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj b/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj
@@ -52,6 +52,40 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <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|x64' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <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|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
     <TargetPlatform Include="Windows, Version=8.1" />
@@ -145,4 +179,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs
@@ -72,6 +72,8 @@ public MainPageViewModel(INavigationService navigationService, IAlertMessageServ
 			this.nextReleaseCountdownTimer.Tick += NextReleaseCountdownTimerOnTick;
 			this.nextReleaseCountdownTimer.Start();
 		    this.NextReleaseCountdownTimerOnTick(null, null);
+
+			this.Projects = new ObservableCollection<Project>();
 	    }
 
         private bool NewProjectCommandCanExecute()
@@ -127,7 +129,9 @@ protected async void InitializeWorkspaceCommandExecuteAsync()
 		    this.RequiresWorkspaceInitialization = this.storageService.RequiresHardStorageInitialization();
             await this.samplesService.GetSamplesAsync();
             await this.LoadProjectsAsync();
-            this.NewProjectCommand?.RaiseCanExecuteChanged();
+
+			if (this.NewProjectCommand != null)
+				this.NewProjectCommand.RaiseCanExecuteChanged();
 	    }
 
 	    public bool LoadingData
@@ -154,15 +158,15 @@ public bool IsNextReleaseReady
 			protected set { this.SetProperty(value); }
 		}
 
-	    public string CurrentVersion => Application.Current.GetVersion();
+	    public string CurrentVersion { get { return Application.Current.GetVersion(); } }
 
-		public RelayCommand InitializeWorkspaceCommand { get; }
+		public RelayCommand InitializeWorkspaceCommand { get; private set; }
 
-		public RelayCommand<Project> ProjectSelectedCommand { get; }
+		public RelayCommand<Project> ProjectSelectedCommand { get; private set; }
 
-		public ObservableCollection<Project> Projects { get; } = new ObservableCollection<Project>();
+		public ObservableCollection<Project> Projects { get; private set; }
 
-		public RelayCommand NewProjectCommand { get; }
+		public RelayCommand NewProjectCommand { get; private set; }
 	}
 
 	[ComVisible(false)]

diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs
@@ -80,7 +80,7 @@ private async Task AssignProjectAsync(Project project)
 			this.projectPlayStateManager.PlayProject();
 		}
 
-		public RelayCommand StopCommand { get; }
+		public RelayCommand StopCommand { get; private set; }
 	}
 
 	public sealed class PlayPageViewModelDesignTime : PlayPageViewModel

diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/ProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/ProjectPageViewModel.cs
@@ -111,11 +111,11 @@ public bool IsEditMode
 		    }
 	    }
 
-	    public RelayCommand EditCommand { get; }
+		public RelayCommand EditCommand { get; private set; }
 
-		public RelayCommand PlayCommand { get; }
+		public RelayCommand PlayCommand { get; private set; }
 
-	    public RelayCommand GoBackCommand { get; }
+		public RelayCommand GoBackCommand { get; private set; }
 
 	    public bool LoadingData
         {

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/AdSettings.xml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/AdSettings.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AdSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<CultureDescriptors CultureName="">
-    <AdDuplex AppId="135231" Probability="0" />
-    <Smaato AppId="101002420" SecondaryId="1001001131" Probability="100" />
-	</CultureDescriptors>
-</AdSettings>

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
@@ -255,12 +255,18 @@ private void OnUnhandledRegistrationException(Exception ex)
 		/// Get an reference to the current Application instance
 		/// as an MvvmAppBase object.
 		/// </summary>
-		public static new App Current => (App)Application.Current;
+		public static new App Current
+		{
+			get { return (App)Application.Current; }
+		}
 
 		/// <summary>
 		/// Get the IoC Unity Container 
 		/// </summary>
-		public IUnityContainer Container => this.container;
+		public IUnityContainer Container 
+		{ 
+			get { return this.container; }
+		}
 
 #region IDisposable Support
         private bool disposedValue = false; // To detect redundant calls
@@ -271,7 +277,8 @@ void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    this.container?.Dispose();
+					if (this.container != null)
+						this.container.Dispose();
                 }
 
                 // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Assets/Thumbs.db b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Assets/Thumbs.db