Merge pull request #1156 from SickheadGames/templates

More VS Templates Fixes
MonoGame · Jan 6, 2013 · 9ec4dd7 · 9ec4dd7
2 parents 08599ee + 6fe4a98
commit 9ec4dd7
Show file tree

Hide file tree

Showing 51 changed files with 31 additions and 22 deletions.
diff --git a/ProjectTemplates/VisualStudio2010/Android/AndroidApplication1.csproj b/ProjectTemplates/VisualStudio2010/Android/AndroidApplication1.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0CC19B4-0B81-4DA7-9409-32408AC14F2C}</ProjectGuid>
+    <ProjectGuid>$guid1$</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>

diff --git a/ProjectTemplates/VisualStudio2010/Android/Properties/AssemblyInfo.cs b/ProjectTemplates/VisualStudio2010/Android/Properties/AssemblyInfo.cs
@@ -7,10 +7,10 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("$projectname$")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyConfiguration("")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("$registeredorganization$")]
-[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -21,7 +21,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("$guid1$")]
+[assembly: Guid("$guid2$")]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/ProjectTemplates/VisualStudio2010/OUYA/OuyaGame1.csproj b/ProjectTemplates/VisualStudio2010/OUYA/OuyaGame1.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0CC19B4-0B81-4DA7-9409-32408AC14F2C}</ProjectGuid>
+    <ProjectGuid>$guid1$</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>

diff --git a/ProjectTemplates/VisualStudio2010/OUYA/Properties/AssemblyInfo.cs b/ProjectTemplates/VisualStudio2010/OUYA/Properties/AssemblyInfo.cs
@@ -7,10 +7,10 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("$projectname$")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyConfiguration("")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("$registeredorganization$")]
-[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -21,7 +21,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("$guid1$")]
+[assembly: Guid("$guid2$")]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/...mplates/VisualStudio2010/Windows/Game1.cs → ...lates/VisualStudio2010/WindowsGL/Game1.cs b/...mplates/VisualStudio2010/Windows/Game1.cs → ...lates/VisualStudio2010/WindowsGL/Game1.cs
diff --git a/...mplates/VisualStudio2010/Windows/Icon.ico → ...lates/VisualStudio2010/WindowsGL/Icon.ico b/...mplates/VisualStudio2010/Windows/Icon.ico → ...lates/VisualStudio2010/WindowsGL/Icon.ico
diff --git a/...Windows/MonoGameWindowsApplication.csproj → ...ndowsGL/MonoGameWindowsApplication.csproj b/...Windows/MonoGameWindowsApplication.csproj → ...ndowsGL/MonoGameWindowsApplication.csproj
diff --git a/...lStudio2010/Windows/MyTemplate.vstemplate → ...tudio2010/WindowsGL/MyTemplate.vstemplate b/...lStudio2010/Windows/MyTemplate.vstemplate → ...tudio2010/WindowsGL/MyTemplate.vstemplate
diff --git a/...lates/VisualStudio2010/Windows/Program.cs → ...tes/VisualStudio2010/WindowsGL/Program.cs b/...lates/VisualStudio2010/Windows/Program.cs → ...tes/VisualStudio2010/WindowsGL/Program.cs
diff --git a/...io2010/Windows/Properties/AssemblyInfo.cs → ...2010/WindowsGL/Properties/AssemblyInfo.cs b/...io2010/Windows/Properties/AssemblyInfo.cs → ...2010/WindowsGL/Properties/AssemblyInfo.cs
diff --git a/...sualStudio2010/Windows/__PreviewImage.png → ...alStudio2010/WindowsGL/__PreviewImage.png b/...sualStudio2010/Windows/__PreviewImage.png → ...alStudio2010/WindowsGL/__PreviewImage.png
diff --git a/...sualStudio2010/Windows/__TemplateIcon.png → ...alStudio2010/WindowsGL/__TemplateIcon.png b/...sualStudio2010/Windows/__TemplateIcon.png → ...alStudio2010/WindowsGL/__TemplateIcon.png
diff --git a/ProjectTemplates/VisualStudio2012/WindowsPhone/Application.csproj b/ProjectTemplates/VisualStudio2012/WindowsPhone/Application.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">ARM</Platform>
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F13744CE-A3B0-426B-8A4A-CF6F482B80CD}</ProjectGuid>
+    <ProjectGuid>$guid1$</ProjectGuid>
     <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>

diff --git a/ProjectTemplates/VisualStudio2012/WindowsPhone/AssemblyInfo.cs b/ProjectTemplates/VisualStudio2012/WindowsPhone/AssemblyInfo.cs
@@ -6,12 +6,12 @@
 // 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("$safeprojectname$")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("$projectname$")]
+[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("$safeprojectname$")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyCompany("$registeredorganization$")]
+[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -21,7 +21,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("884d4b41-7b23-496c-ba72-db2c249b074e")]
+[assembly: Guid("$guid2$")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -30,8 +30,9 @@
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Revision and Build Numbers 
+// 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.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/.../VisualStudio2012/Game/Application.csproj → ...tudio2012/WindowsStore/Application.csproj b/.../VisualStudio2012/Game/Application.csproj → ...tudio2012/WindowsStore/Application.csproj
diff --git a/...dio2012/Game/Application_TemporaryKey.pfx → ...WindowsStore/Application_TemporaryKey.pfx b/...dio2012/Game/Application_TemporaryKey.pfx → ...WindowsStore/Application_TemporaryKey.pfx
diff --git a/...tes/VisualStudio2012/Game/AssemblyInfo.cs → ...alStudio2012/WindowsStore/AssemblyInfo.cs b/...tes/VisualStudio2012/Game/AssemblyInfo.cs → ...alStudio2012/WindowsStore/AssemblyInfo.cs
@@ -6,14 +6,19 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("$projectname$")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyConfiguration("")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("$registeredorganization$")]
-[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
 [assembly: AssemblyTrademark("")]
 [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 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
@@ -26,4 +31,3 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
diff --git a/...tTemplates/VisualStudio2012/Game/Game1.cs → ...es/VisualStudio2012/WindowsStore/Game1.cs b/...tTemplates/VisualStudio2012/Game/Game1.cs → ...es/VisualStudio2012/WindowsStore/Game1.cs
diff --git a/...tTemplates/VisualStudio2012/Game/Logo.png → ...es/VisualStudio2012/WindowsStore/Logo.png b/...tTemplates/VisualStudio2012/Game/Logo.png → ...es/VisualStudio2012/WindowsStore/Logo.png
diff --git a/...dio2012/Game/Package-managed.appxmanifest → ...WindowsStore/Package-managed.appxmanifest b/...dio2012/Game/Package-managed.appxmanifest → ...WindowsStore/Package-managed.appxmanifest
diff --git a/...emplates/VisualStudio2012/Game/Program.cs → .../VisualStudio2012/WindowsStore/Program.cs b/...emplates/VisualStudio2012/Game/Program.cs → .../VisualStudio2012/WindowsStore/Program.cs
diff --git a/...lates/VisualStudio2012/Game/SmallLogo.png → ...sualStudio2012/WindowsStore/SmallLogo.png b/...lates/VisualStudio2012/Game/SmallLogo.png → ...sualStudio2012/WindowsStore/SmallLogo.png
diff --git a/...es/VisualStudio2012/Game/SplashScreen.png → ...lStudio2012/WindowsStore/SplashScreen.png b/...es/VisualStudio2012/Game/SplashScreen.png → ...lStudio2012/WindowsStore/SplashScreen.png
diff --git a/...lates/VisualStudio2012/Game/StoreLogo.png → ...sualStudio2012/WindowsStore/StoreLogo.png b/...lates/VisualStudio2012/Game/StoreLogo.png → ...sualStudio2012/WindowsStore/StoreLogo.png
diff --git a/...s/VisualStudio2012/Game/__Game.vstemplate → ...Studio2012/WindowsStore/__Game.vstemplate b/...s/VisualStudio2012/Game/__Game.vstemplate → ...Studio2012/WindowsStore/__Game.vstemplate
diff --git a/.../VisualStudio2012/Game/__PreviewImage.png → ...tudio2012/WindowsStore/__PreviewImage.png b/.../VisualStudio2012/Game/__PreviewImage.png → ...tudio2012/WindowsStore/__PreviewImage.png
diff --git a/.../VisualStudio2012/Game/__TemplateIcon.png → ...tudio2012/WindowsStore/__TemplateIcon.png b/.../VisualStudio2012/Game/__TemplateIcon.png → ...tudio2012/WindowsStore/__TemplateIcon.png
diff --git a/...plates/VisualStudio2012/XamlGame/App.xaml → ...isualStudio2012/WindowsStoreXaml/App.xaml b/...plates/VisualStudio2012/XamlGame/App.xaml → ...isualStudio2012/WindowsStoreXaml/App.xaml
diff --git a/...tes/VisualStudio2012/XamlGame/App.xaml.cs → ...alStudio2012/WindowsStoreXaml/App.xaml.cs b/...tes/VisualStudio2012/XamlGame/App.xaml.cs → ...alStudio2012/WindowsStoreXaml/App.xaml.cs
diff --git a/...ualStudio2012/XamlGame/Application.csproj → ...o2012/WindowsStoreXaml/Application.csproj b/...ualStudio2012/XamlGame/Application.csproj → ...o2012/WindowsStoreXaml/Application.csproj
diff --git a/...012/XamlGame/Application_TemporaryKey.pfx → ...owsStoreXaml/Application_TemporaryKey.pfx b/...012/XamlGame/Application_TemporaryKey.pfx → ...owsStoreXaml/Application_TemporaryKey.pfx
diff --git a/...VisualStudio2012/XamlGame/AssemblyInfo.cs → ...udio2012/WindowsStoreXaml/AssemblyInfo.cs b/...VisualStudio2012/XamlGame/AssemblyInfo.cs → ...udio2012/WindowsStoreXaml/AssemblyInfo.cs
@@ -6,14 +6,19 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("$projectname$")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyConfiguration("")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("$registeredorganization$")]
-[assembly: AssemblyProduct("$projectname$")]
 [assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
 [assembly: AssemblyTrademark("")]
 [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 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
@@ -26,4 +31,3 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
diff --git a/...VisualStudio2012/XamlGame/BindableBase.cs → ...udio2012/WindowsStoreXaml/BindableBase.cs b/...VisualStudio2012/XamlGame/BindableBase.cs → ...udio2012/WindowsStoreXaml/BindableBase.cs
diff --git a/...2012/XamlGame/BooleanNegationConverter.cs → ...dowsStoreXaml/BooleanNegationConverter.cs b/...2012/XamlGame/BooleanNegationConverter.cs → ...dowsStoreXaml/BooleanNegationConverter.cs
diff --git a/.../XamlGame/BooleanToVisibilityConverter.cs → ...StoreXaml/BooleanToVisibilityConverter.cs b/.../XamlGame/BooleanToVisibilityConverter.cs → ...StoreXaml/BooleanToVisibilityConverter.cs
diff --git a/...plates/VisualStudio2012/XamlGame/Game1.cs → ...isualStudio2012/WindowsStoreXaml/Game1.cs b/...plates/VisualStudio2012/XamlGame/Game1.cs → ...isualStudio2012/WindowsStoreXaml/Game1.cs
diff --git a/...s/VisualStudio2012/XamlGame/GamePage.xaml → ...Studio2012/WindowsStoreXaml/GamePage.xaml b/...s/VisualStudio2012/XamlGame/GamePage.xaml → ...Studio2012/WindowsStoreXaml/GamePage.xaml
diff --git a/...isualStudio2012/XamlGame/GamePage.xaml.cs → ...dio2012/WindowsStoreXaml/GamePage.xaml.cs b/...isualStudio2012/XamlGame/GamePage.xaml.cs → ...dio2012/WindowsStoreXaml/GamePage.xaml.cs
diff --git a/...ualStudio2012/XamlGame/LayoutAwarePage.cs → ...o2012/WindowsStoreXaml/LayoutAwarePage.cs b/...ualStudio2012/XamlGame/LayoutAwarePage.cs → ...o2012/WindowsStoreXaml/LayoutAwarePage.cs
diff --git a/...plates/VisualStudio2012/XamlGame/Logo.png → ...isualStudio2012/WindowsStoreXaml/Logo.png b/...plates/VisualStudio2012/XamlGame/Logo.png → ...isualStudio2012/WindowsStoreXaml/Logo.png
diff --git a/...012/XamlGame/Package-managed.appxmanifest → ...owsStoreXaml/Package-managed.appxmanifest b/...012/XamlGame/Package-managed.appxmanifest → ...owsStoreXaml/Package-managed.appxmanifest
diff --git a/...ates/VisualStudio2012/XamlGame/ReadMe.txt → ...ualStudio2012/WindowsStoreXaml/ReadMe.txt b/...ates/VisualStudio2012/XamlGame/ReadMe.txt → ...ualStudio2012/WindowsStoreXaml/ReadMe.txt
diff --git a/...ualStudio2012/XamlGame/RichTextColumns.cs → ...o2012/WindowsStoreXaml/RichTextColumns.cs b/...ualStudio2012/XamlGame/RichTextColumns.cs → ...o2012/WindowsStoreXaml/RichTextColumns.cs
diff --git a/...s/VisualStudio2012/XamlGame/SmallLogo.png → ...Studio2012/WindowsStoreXaml/SmallLogo.png b/...s/VisualStudio2012/XamlGame/SmallLogo.png → ...Studio2012/WindowsStoreXaml/SmallLogo.png
diff --git a/...isualStudio2012/XamlGame/SplashScreen.png → ...dio2012/WindowsStoreXaml/SplashScreen.png b/...isualStudio2012/XamlGame/SplashScreen.png → ...dio2012/WindowsStoreXaml/SplashScreen.png
diff --git a/...alStudio2012/XamlGame/StandardStyles.xaml → ...2012/WindowsStoreXaml/StandardStyles.xaml b/...alStudio2012/XamlGame/StandardStyles.xaml → ...2012/WindowsStoreXaml/StandardStyles.xaml
diff --git a/...s/VisualStudio2012/XamlGame/StoreLogo.png → ...Studio2012/WindowsStoreXaml/StoreLogo.png b/...s/VisualStudio2012/XamlGame/StoreLogo.png → ...Studio2012/WindowsStoreXaml/StoreLogo.png
diff --git a/...lStudio2012/XamlGame/SuspensionManager.cs → ...012/WindowsStoreXaml/SuspensionManager.cs b/...lStudio2012/XamlGame/SuspensionManager.cs → ...012/WindowsStoreXaml/SuspensionManager.cs
diff --git a/...ualStudio2012/XamlGame/__PreviewImage.png → ...o2012/WindowsStoreXaml/__PreviewImage.png b/...ualStudio2012/XamlGame/__PreviewImage.png → ...o2012/WindowsStoreXaml/__PreviewImage.png
diff --git a/...ualStudio2012/XamlGame/__TemplateIcon.png → ...o2012/WindowsStoreXaml/__TemplateIcon.png b/...ualStudio2012/XamlGame/__TemplateIcon.png → ...o2012/WindowsStoreXaml/__TemplateIcon.png
diff --git a/...Studio2012/XamlGame/__XamlGame.vstemplate → ...12/WindowsStoreXaml/__XamlGame.vstemplate b/...Studio2012/XamlGame/__XamlGame.vstemplate → ...12/WindowsStoreXaml/__XamlGame.vstemplate