Merge pull request #211 from vosen/master

Bump version to 0.1.2 and give multirust priority over global install
PistonDevelopers · Mar 9, 2016 · 6967a56 · 6967a56
2 parents 14ac665 + b7ca14f
commit 6967a56
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/Microsoft.VisualStudio.Project/Properties/AssemblyInfo.cs b/Microsoft.VisualStudio.Project/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // 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("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
 
 [assembly: InternalsVisibleTo("VisualRust, PublicKey=00240000048000009400000006020000002400005253413100040000010001007755e184d6da3fe8b941736d1567d465beee5164177fa4517975dc035826e7cb94d733944a9df378cc038429af191f7ca06ddd4a146e6cd5882595030cfcf82b194cec14fe9745368245993236e5059f21a5721c0cad36c71bfa9101f41ac58c39318fdf91b7abf4ae799aa7e3ed5cb79efac57b651eb04c105219cbf1b2b69f")]
 [assembly: InternalsVisibleTo("VisualRust.Project, PublicKey=00240000048000009400000006020000002400005253413100040000010001007755e184d6da3fe8b941736d1567d465beee5164177fa4517975dc035826e7cb94d733944a9df378cc038429af191f7ca06ddd4a146e6cd5882595030cfcf82b194cec14fe9745368245993236e5059f21a5721c0cad36c71bfa9101f41ac58c39318fdf91b7abf4ae799aa7e3ed5cb79efac57b651eb04c105219cbf1b2b69f")]

diff --git a/RustLexer/Properties/AssemblyInfo.cs b/RustLexer/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // 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("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
 
 [assembly: System.CLSCompliant(true)]
diff --git a/VisualRust.Build/Properties/AssemblyInfo.cs b/VisualRust.Build/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
diff --git a/VisualRust.Project/Properties/AssemblyInfo.cs b/VisualRust.Project/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // 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("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
 
 [assembly: InternalsVisibleTo("VisualRust, PublicKey=00240000048000009400000006020000002400005253413100040000010001007755e184d6da3fe8b941736d1567d465beee5164177fa4517975dc035826e7cb94d733944a9df378cc038429af191f7ca06ddd4a146e6cd5882595030cfcf82b194cec14fe9745368245993236e5059f21a5721c0cad36c71bfa9101f41ac58c39318fdf91b7abf4ae799aa7e3ed5cb79efac57b651eb04c105219cbf1b2b69f")]
 #if TEST

diff --git a/VisualRust.Setup/VisualRust.wxs b/VisualRust.Setup/VisualRust.wxs
@@ -3,7 +3,7 @@
   <Product Id="*"
            Name="Visual Rust"
            Language="1033"
-           Version="0.1.1.0"
+           Version="0.1.2.0"
            Manufacturer="The Piston Project"
            UpgradeCode="{B5CC88F7-BC23-4400-95D8-9EE3FA95CC3F}">
     <Package InstallerVersion="400"

diff --git a/VisualRust.Shared/Environment.cs b/VisualRust.Shared/Environment.cs
@@ -85,17 +85,17 @@ private static IEnumerable<string> GetAllInstallPaths()
             {
                 return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry64)
                     .Union(GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32))
+                    .Union(new string[] { GetMultirustInstallRoot() })
                     .Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry64))
                     .Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))
-                    .Union(GetInnoInstallRoot())
-                    .Union(new string[] { GetMultirustInstallRoot() });
+                    .Union(GetInnoInstallRoot());
             }
             else
             {
                 return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32)
+                    .Union(new string[] { GetMultirustInstallRoot() })
                     .Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))
-                    .Union(GetInnoInstallRoot())
-                    .Union(new string[] { GetMultirustInstallRoot() });
+                    .Union(GetInnoInstallRoot());
             }
         }
 

diff --git a/VisualRust.Shared/Properties/AssemblyInfo.cs b/VisualRust.Shared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
diff --git a/VisualRust.Templates/Properties/AssemblyInfo.cs b/VisualRust.Templates/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
diff --git a/VisualRust/Properties/AssemblyInfo.cs b/VisualRust/Properties/AssemblyInfo.cs
@@ -27,8 +27,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
 
 
 
diff --git a/VisualRust/VisualRustPackage.cs b/VisualRust/VisualRustPackage.cs
@@ -35,7 +35,7 @@ namespace VisualRust
     [PackageRegistration(UseManagedResourcesOnly = true)]
     // This attribute is used to register the information needed to show this package
     // in the Help/About dialog of Visual Studio.
-    [InstalledProductRegistration("#110", "#112", "0.1.1", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "0.1.2", IconResourceID = 400)]
     [ProvideLanguageService(typeof(RustLanguage), "Rust", 100, 
         CodeSense = true, 
         DefaultToInsertSpaces = true,
@@ -281,7 +281,7 @@ public override string GetProductDescription()
 
         public override string GetProductVersion()
         {
-            return "0.1.1";
+            return "0.1.2";
         }
     }
 }
diff --git a/VisualRust/source.extension.debug.vsixmanifest b/VisualRust/source.extension.debug.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.1" Language="en-US" Publisher="The Piston Project" />
+    <Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.2" Language="en-US" Publisher="The Piston Project" />
     <DisplayName>Visual Rust</DisplayName>
     <Description>Visual Studio integration for the Rust programming language (http://www.rust-lang.org/)</Description>
     <License>LICENSE.txt</License>

diff --git a/VisualRust/source.extension.release.vsixmanifest b/VisualRust/source.extension.release.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.1" Language="en-US" Publisher="The Piston Project" />
+    <Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.2" Language="en-US" Publisher="The Piston Project" />
     <DisplayName>Visual Rust</DisplayName>
     <Description>Visual Studio integration for the Rust programming language (http://www.rust-lang.org/)</Description>
     <License>LICENSE.txt</License>