Skip to content

Commit 6967a56

Browse files
vosenvosen
committed
Merge pull request #211 from vosen/master
Bump version to 0.1.2 and give multirust priority over global install
2 parents 14ac665 + b7ca14f commit 6967a56

File tree

12 files changed

+23
-23
lines changed

12 files changed

+23
-23
lines changed

‎Microsoft.VisualStudio.Project/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]
3737

3838
[assembly: InternalsVisibleTo("VisualRust, PublicKey=00240000048000009400000006020000002400005253413100040000010001007755e184d6da3fe8b941736d1567d465beee5164177fa4517975dc035826e7cb94d733944a9df378cc038429af191f7ca06ddd4a146e6cd5882595030cfcf82b194cec14fe9745368245993236e5059f21a5721c0cad36c71bfa9101f41ac58c39318fdf91b7abf4ae799aa7e3ed5cb79efac57b651eb04c105219cbf1b2b69f")]
3939
[assembly: InternalsVisibleTo("VisualRust.Project, PublicKey=00240000048000009400000006020000002400005253413100040000010001007755e184d6da3fe8b941736d1567d465beee5164177fa4517975dc035826e7cb94d733944a9df378cc038429af191f7ca06ddd4a146e6cd5882595030cfcf82b194cec14fe9745368245993236e5059f21a5721c0cad36c71bfa9101f41ac58c39318fdf91b7abf4ae799aa7e3ed5cb79efac57b651eb04c105219cbf1b2b69f")]

‎RustLexer/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]
3737

3838
[assembly: System.CLSCompliant(true)]

‎VisualRust.Build/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]

‎VisualRust.Project/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]
3737

3838
[assembly: InternalsVisibleTo("VisualRust, PublicKey=00240000048000009400000006020000002400005253413100040000010001007755e184d6da3fe8b941736d1567d465beee5164177fa4517975dc035826e7cb94d733944a9df378cc038429af191f7ca06ddd4a146e6cd5882595030cfcf82b194cec14fe9745368245993236e5059f21a5721c0cad36c71bfa9101f41ac58c39318fdf91b7abf4ae799aa7e3ed5cb79efac57b651eb04c105219cbf1b2b69f")]
3939
#if TEST

‎VisualRust.Setup/VisualRust.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Product Id="*"
44
Name="Visual Rust"
55
Language="1033"
6-
Version="0.1.1.0"
6+
Version="0.1.2.0"
77
Manufacturer="The Piston Project"
88
UpgradeCode="{B5CC88F7-BC23-4400-95D8-9EE3FA95CC3F}">
99
<Package InstallerVersion="400"

‎VisualRust.Shared/Environment.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@ private static IEnumerable<string> GetAllInstallPaths()
8585
{
8686
return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry64)
8787
.Union(GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32))
88+
.Union(new string[] { GetMultirustInstallRoot() })
8889
.Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry64))
8990
.Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))
90-
.Union(GetInnoInstallRoot())
91-
.Union(new string[] { GetMultirustInstallRoot() });
91+
.Union(GetInnoInstallRoot());
9292
}
9393
else
9494
{
9595
return GetInstallRoots(RegistryHive.CurrentUser, RegistryView.Registry32)
96+
.Union(new string[] { GetMultirustInstallRoot() })
9697
.Union(GetInstallRoots(RegistryHive.LocalMachine, RegistryView.Registry32))
97-
.Union(GetInnoInstallRoot())
98-
.Union(new string[] { GetMultirustInstallRoot() });
98+
.Union(GetInnoInstallRoot());
9999
}
100100
}
101101

‎VisualRust.Shared/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]

‎VisualRust.Templates/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]

‎VisualRust/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
// You can specify all the values or you can default the Revision and Build Numbers
2828
// by using the '*' as shown below:
2929

30-
[assembly: AssemblyVersion("0.1.1.0")]
31-
[assembly: AssemblyFileVersion("0.1.1.0")]
30+
[assembly: AssemblyVersion("0.1.2.0")]
31+
[assembly: AssemblyFileVersion("0.1.2.0")]
3232

3333

3434

‎VisualRust/VisualRustPackage.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace VisualRust
3535
[PackageRegistration(UseManagedResourcesOnly = true)]
3636
// This attribute is used to register the information needed to show this package
3737
// in the Help/About dialog of Visual Studio.
38-
[InstalledProductRegistration("#110", "#112", "0.1.1", IconResourceID = 400)]
38+
[InstalledProductRegistration("#110", "#112", "0.1.2", IconResourceID = 400)]
3939
[ProvideLanguageService(typeof(RustLanguage), "Rust", 100,
4040
CodeSense = true,
4141
DefaultToInsertSpaces = true,
@@ -281,7 +281,7 @@ public override string GetProductDescription()
281281

282282
public override string GetProductVersion()
283283
{
284-
return "0.1.1";
284+
return "0.1.2";
285285
}
286286
}
287287
}

‎VisualRust/source.extension.debug.vsixmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.1" Language="en-US" Publisher="The Piston Project" />
4+
<Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.2" Language="en-US" Publisher="The Piston Project" />
55
<DisplayName>Visual Rust</DisplayName>
66
<Description>Visual Studio integration for the Rust programming language (http://www.rust-lang.org/)</Description>
77
<License>LICENSE.txt</License>

‎VisualRust/source.extension.release.vsixmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.1" Language="en-US" Publisher="The Piston Project" />
4+
<Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.1.2" Language="en-US" Publisher="The Piston Project" />
55
<DisplayName>Visual Rust</DisplayName>
66
<Description>Visual Studio integration for the Rust programming language (http://www.rust-lang.org/)</Description>
77
<License>LICENSE.txt</License>

0 commit comments

Comments
 (0)