Skip to content

Commit

Permalink
Bootstrap was wrong for Visual C++ 2010 Runtime Libraries (x86). New
Browse files Browse the repository at this point in the history 
version.
  • Loading branch information
@mattiasclaesson
mattiasclaesson committed Dec 5, 2015
1 parent a196c37 commit 9fb8920
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 54 deletions.
105 changes: 55 additions & 50 deletions SetupCANFlash/SetupCANFlash.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@
{
"Entry"
{
"MsmKey" = "8:_1CD663634790325E7A026BEAFF7B9EB4"
"OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"MsmKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_1CD663634790325E7A026BEAFF7B9EB4"
"OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
"MsmKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"OwnerKey" = "8:_UNDEFINED"
"MsmKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"MsmKey" = "8:_7747543A6C6FB526E50E3C76BEF28F10"
"OwnerKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
"MsmKey" = "8:_7747543A6C6FB526E50E3C76BEF28F10"
"OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -69,20 +69,20 @@
}
"Entry"
{
"MsmKey" = "8:_A437E1A2EF91AB37C80E69415C904FF6"
"OwnerKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
"MsmKey" = "8:_B69D594B59284F939B1F4A00C77E172B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_A437E1A2EF91AB37C80E69415C904FF6"
"MsmKey" = "8:_C4BD42520AFF43C457B1F6D462F382F8"
"OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_B69D594B59284F939B1F4A00C77E172B"
"OwnerKey" = "8:_UNDEFINED"
"MsmKey" = "8:_C4BD42520AFF43C457B1F6D462F382F8"
"OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -130,19 +130,19 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"OwnerKey" = "8:_7747543A6C6FB526E50E3C76BEF28F10"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A437E1A2EF91AB37C80E69415C904FF6"
"OwnerKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1CD663634790325E7A026BEAFF7B9EB4"
"OwnerKey" = "8:_C4BD42520AFF43C457B1F6D462F382F8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -225,6 +225,11 @@
"Name" = "8:Microsoft .NET Framework 4 (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.0"
}
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.10.0.x86"
{
"Name" = "8:Visual C++ 2010 Runtime Libraries (x86)"
"ProductCode" = "8:Microsoft.Visual.C++.10.0.x86"
}
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
{
"Name" = "8:Windows Installer 3.1"
Expand Down Expand Up @@ -261,20 +266,20 @@
}
"File"
{
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1CD663634790325E7A026BEAFF7B9EB4"
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5879D9CF7D1DBAFFFF4A4322A269CC00"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:canlibCLSNET, Version=8.8.823.1, Culture=neutral, PublicKeyToken=bb7f2cd46200de24, processorArchitecture=x86"
"AssemblyAsmDisplayName" = "8:canusbdrv_net, Version=2.0.0.1, Culture=neutral, processorArchitecture=x86"
"ScatterAssemblies"
{
"_1CD663634790325E7A026BEAFF7B9EB4"
"_5879D9CF7D1DBAFFFF4A4322A269CC00"
{
"Name" = "8:canlibCLSNET.dll"
"Name" = "8:canusbdrv_net.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:canlibCLSNET.dll"
"SourcePath" = "8:canusbdrv_net.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
Expand All @@ -292,20 +297,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5879D9CF7D1DBAFFFF4A4322A269CC00"
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7747543A6C6FB526E50E3C76BEF28F10"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:canusbdrv_net, Version=2.0.0.1, Culture=neutral, processorArchitecture=x86"
"AssemblyAsmDisplayName" = "8:FTD2XX_NET, Version=1.0.10.0, Culture=neutral, PublicKeyToken=61a8105588f51b1f, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_5879D9CF7D1DBAFFFF4A4322A269CC00"
"_7747543A6C6FB526E50E3C76BEF28F10"
{
"Name" = "8:canusbdrv_net.dll"
"Name" = "8:FTD2XX_NET.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:canusbdrv_net.dll"
"SourcePath" = "8:FTD2XX_NET.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
Expand Down Expand Up @@ -385,21 +390,10 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A437E1A2EF91AB37C80E69415C904FF6"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B69D594B59284F939B1F4A00C77E172B"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:FTD2XX_NET, Version=1.0.10.0, Culture=neutral, PublicKeyToken=61a8105588f51b1f, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_A437E1A2EF91AB37C80E69415C904FF6"
{
"Name" = "8:FTD2XX_NET.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:FTD2XX_NET.dll"
"TargetName" = "8:"
"SourcePath" = "8:..\\TrionicCANFlasher\\TrionicCanFlasher.ico"
"TargetName" = "8:TrionicCanFlasher.ico"
"Tag" = "8:"
"Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
"Condition" = "8:"
Expand All @@ -413,13 +407,24 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B69D594B59284F939B1F4A00C77E172B"
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C4BD42520AFF43C457B1F6D462F382F8"
{
"SourcePath" = "8:..\\TrionicCANFlasher\\TrionicCanFlasher.ico"
"TargetName" = "8:TrionicCanFlasher.ico"
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:canlibCLSNET, Version=8.8.823.1, Culture=neutral, PublicKeyToken=bb7f2cd46200de24, processorArchitecture=x86"
"ScatterAssemblies"
{
"_C4BD42520AFF43C457B1F6D462F382F8"
{
"Name" = "8:canlibCLSNET.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:canlibCLSNET.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
"Condition" = "8:"
Expand All @@ -433,7 +438,7 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D42D3477D8D2384CECF37D5EA679190F"
Expand Down Expand Up @@ -554,15 +559,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:TrionicCANFlash"
"ProductCode" = "8:{6E665D8C-19F9-46C2-890B-720042D6FC3C}"
"PackageCode" = "8:{E60CCDEF-9A94-492D-B986-37A3B9D6305B}"
"ProductCode" = "8:{77193E9C-3156-4030-81D3-9E224C1758C1}"
"PackageCode" = "8:{0D04D1C4-2CCB-494A-8D76-29CC9607252D}"
"UpgradeCode" = "8:{9B523E43-7324-4DF0-A1DE-8493B57D1915}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:0.1.27"
"ProductVersion" = "8:0.1.28"
"Manufacturer" = "8:MattiasC"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.txsuite.org"
Expand Down
4 changes: 2 additions & 2 deletions SetupCANFlash/version.bat
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
set TrionicCANFlasher.version=0.1.27.0
set TrionicCANFlasher.version=0.1.28.0
set TrionicCANLib.version=0.1.18.0
set SetupCANFlash.version=0.1.27
set SetupCANFlash.version=0.1.28
4 changes: 2 additions & 2 deletions TrionicCANFlasher/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.27.0")]
[assembly: AssemblyFileVersion("0.1.27.0")]
[assembly: AssemblyVersion("0.1.28.0")]
[assembly: AssemblyFileVersion("0.1.28.0")]

0 comments on commit 9fb8920

Please sign in to comment.