Index: Externals/Eagle/lib/Eagle1.0/vendor.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/vendor.eagle
+++ Externals/Eagle/lib/Eagle1.0/vendor.eagle
@@ -160,12 +160,12 @@
# NOTE: Check for any overridden settings that may have been specified via
# the command line, etc.
#
checkForTestOverrides stdout [list binary_directory build_base_directory \
build_directory common_directory connection_flags database_directory \
- datetime_format test_configuration test_year test_year_netFx20 \
- test_year_netFx40 vendor_directory] false
+ datetime_format test_configuration test_year test_year_clr_v2 \
+ test_year_clr_v4 vendor_directory] false
#
# NOTE: This variable will contain the name of the directory containing the
# vendor-specific testing infrastructure. If the variable does not
# already exist, create it; otherwise, it has been overridden and the
ADDED Externals/MSVCPP/vcredist_x64_2005_SP1.exe
Index: Externals/MSVCPP/vcredist_x64_2005_SP1.exe
==================================================================
--- /dev/null
+++ Externals/MSVCPP/vcredist_x64_2005_SP1.exe
cannot compute difference between binary files
ADDED Externals/MSVCPP/vcredist_x64_2012_RTM.exe
Index: Externals/MSVCPP/vcredist_x64_2012_RTM.exe
==================================================================
--- /dev/null
+++ Externals/MSVCPP/vcredist_x64_2012_RTM.exe
cannot compute difference between binary files
ADDED Externals/MSVCPP/vcredist_x86_2005_SP1.exe
Index: Externals/MSVCPP/vcredist_x86_2005_SP1.exe
==================================================================
--- /dev/null
+++ Externals/MSVCPP/vcredist_x86_2005_SP1.exe
cannot compute difference between binary files
ADDED Externals/MSVCPP/vcredist_x86_2012_RTM.exe
Index: Externals/MSVCPP/vcredist_x86_2012_RTM.exe
==================================================================
--- /dev/null
+++ Externals/MSVCPP/vcredist_x86_2012_RTM.exe
cannot compute difference between binary files
Index: Membership/SQLiteProvider.2012.csproj
==================================================================
--- Membership/SQLiteProvider.2012.csproj
+++ Membership/SQLiteProvider.2012.csproj
@@ -17,10 +17,11 @@
Properties
SQLiteProvider
SQLiteProvider
$(MSBuildProjectDirectory)\..
2012
+ v4.5
$(BinaryOutputPath)
Index: SQLite.Designer/SQLite.Designer.2012.csproj
==================================================================
--- SQLite.Designer/SQLite.Designer.2012.csproj
+++ SQLite.Designer/SQLite.Designer.2012.csproj
@@ -15,13 +15,13 @@
{9B4A5CF6-5BE5-4926-ACC7-B729A8C05198}
Library
Properties
SQLite.Designer
SQLite.Designer
- v4.5
$(MSBuildProjectDirectory)\..
2012
+ v4.5
$(BinaryOutputPath)
Index: SQLite.NET.2005.MSBuild.sln
==================================================================
--- SQLite.NET.2005.MSBuild.sln
+++ SQLite.NET.2005.MSBuild.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2005", "System.Data.SQLite\System.Data.SQLite.2005.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2005", "System.Data.SQLite\System.Data.SQLite.Module.2005.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2005.sln
==================================================================
--- SQLite.NET.2005.sln
+++ SQLite.NET.2005.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2005", "System.Data.SQLite\System.Data.SQLite.2005.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2005", "System.Data.SQLite\System.Data.SQLite.Module.2005.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2008.MSBuild.sln
==================================================================
--- SQLite.NET.2008.MSBuild.sln
+++ SQLite.NET.2008.MSBuild.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2008", "System.Data.SQLite\System.Data.SQLite.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2008", "System.Data.SQLite\System.Data.SQLite.Module.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2008.sln
==================================================================
--- SQLite.NET.2008.sln
+++ SQLite.NET.2008.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2008", "System.Data.SQLite\System.Data.SQLite.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2008", "System.Data.SQLite\System.Data.SQLite.Module.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2010.MSBuild.sln
==================================================================
--- SQLite.NET.2010.MSBuild.sln
+++ SQLite.NET.2010.MSBuild.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2010", "System.Data.SQLite\System.Data.SQLite.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2010", "System.Data.SQLite\System.Data.SQLite.Module.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2010.sln
==================================================================
--- SQLite.NET.2010.sln
+++ SQLite.NET.2010.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2010", "System.Data.SQLite\System.Data.SQLite.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2010", "System.Data.SQLite\System.Data.SQLite.Module.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2012.MSBuild.sln
==================================================================
--- SQLite.NET.2012.MSBuild.sln
+++ SQLite.NET.2012.MSBuild.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2012", "System.Data.SQLite\System.Data.SQLite.2012.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2012", "System.Data.SQLite\System.Data.SQLite.Module.2012.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: SQLite.NET.2012.sln
==================================================================
--- SQLite.NET.2012.sln
+++ SQLite.NET.2012.sln
@@ -1,14 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
ProjectSection(SolutionItems) = preProject
+ exclude_bin.txt = exclude_bin.txt
+ exclude_src.txt = exclude_src.txt
+ install.ps1 = install.ps1
readme.htm = readme.htm
+ SQLite.MSIL.nuspec = SQLite.MSIL.nuspec
SQLite.NET.Settings.targets = SQLite.NET.Settings.targets
+ SQLite.nuspec = SQLite.nuspec
+ SQLite.x64.nuspec = SQLite.x64.nuspec
+ SQLite.x86.nuspec = SQLite.x86.nuspec
+ System.Data.SQLite\System.Data.SQLite.CF.snk = System.Data.SQLite\System.Data.SQLite.CF.snk
System.Data.SQLite\System.Data.SQLite.Files.targets = System.Data.SQLite\System.Data.SQLite.Files.targets
System.Data.SQLite\System.Data.SQLite.Properties.targets = System.Data.SQLite\System.Data.SQLite.Properties.targets
System.Data.SQLite\System.Data.SQLite.References.targets = System.Data.SQLite\System.Data.SQLite.References.targets
+ System.Data.SQLite\System.Data.SQLite.snk = System.Data.SQLite\System.Data.SQLite.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2012", "System.Data.SQLite\System.Data.SQLite.2012.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2012", "System.Data.SQLite\System.Data.SQLite.Module.2012.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
Index: Setup/SQLite.iss
==================================================================
--- Setup/SQLite.iss
+++ Setup/SQLite.iss
@@ -55,63 +55,105 @@
[Components]
Name: Application; Description: System.Data.SQLite components.; Types: custom compact full
Name: Application\Core; Description: Core components.; Types: custom compact full
Name: Application\Core\MSIL; Description: Core managed components.; Types: custom compact full
Name: Application\Core\{#AppProcessor}; Description: Core native {#AppProcessor} components.; Types: custom compact full
+
+#if Year != "2005"
Name: Application\LINQ; Description: LINQ support components.; Types: custom compact full
+#endif
+
Name: Application\Designer; Description: Visual Studio designer components.; Types: custom full
Name: Application\Designer\Installer; Description: Visual Studio designer installer components.; Types: custom full
Name: Application\Symbols; Description: Debugging symbol components.; Types: custom compact full
Name: Application\Documentation; Description: Documentation components.; Types: custom compact full
Name: Application\Test; Description: Test components.; Types: custom compact full
[Tasks]
+#if Year == "2005"
+Components: Application\Core\MSIL; Name: ngen; Description: Generate native images for the assemblies and install the images in the native image cache.; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup()
+#else
Components: Application\Core\MSIL Or Application\LINQ; Name: ngen; Description: Generate native images for the assemblies and install the images in the native image cache.; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup()
+#endif
#if Pos("NativeOnly", AppConfiguration) == 0
+#if Year == "2005"
+Components: Application\Core\MSIL; Name: gac; Description: Install the assemblies into the global assembly cache.; Flags: unchecked; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup()
+#else
Components: Application\Core\MSIL Or Application\LINQ; Name: gac; Description: Install the assemblies into the global assembly cache.; Flags: unchecked; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup()
+#endif
#if AppProcessor == "x86"
+#if Year == "2005"
Components: {#InstallerCondition}; Name: gac\vs2005; Description: Install the designer components for Visual Studio 2005.; Flags: unchecked; Check: CheckIsNetFx2Setup()
+#endif
+#if Year == "2008"
Components: {#InstallerCondition}; Name: gac\vs2008; Description: Install the designer components for Visual Studio 2008.; Flags: unchecked; Check: CheckIsNetFx2Setup()
+#endif
+#if Year == "2010"
Components: {#InstallerCondition}; Name: gac\vs2010; Description: Install the designer components for Visual Studio 2010.; Flags: unchecked; Check: CheckIsNetFx4Setup()
+#endif
+#if Year == "2012"
Components: {#InstallerCondition}; Name: gac\vs2012; Description: Install the designer components for Visual Studio 2012.; Flags: unchecked; Check: CheckIsNetFx4Setup()
+#endif
#endif
#endif
[Run]
Components: Application\Core\MSIL; Tasks: ngen; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
Components: Application\Core\MSIL; Tasks: ngen; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+
+#if Year != "2005"
Components: Application\LINQ; Tasks: ngen; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() and CheckForNetFx35(1)
Components: Application\LINQ; Tasks: ngen; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+#endif
#if Pos("NativeOnly", AppConfiguration) == 0 && AppProcessor == "x86"
+#if Year == "2005"
Components: {#InstallerCondition}; Tasks: gac\vs2005; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx40 true -noNetFx45 true -noVs2008 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
+#endif
+#if Year == "2008"
Components: {#InstallerCondition}; Tasks: gac\vs2008; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx40 true -noNetFx45 true -noVs2005 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
+#endif
+#if Year == "2010"
Components: {#InstallerCondition}; Tasks: gac\vs2010; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx45 true -noVs2005 true -noVs2008 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+#endif
+#if Year == "2012"
Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+#endif
#endif
[UninstallRun]
#if Pos("NativeOnly", AppConfiguration) == 0 && AppProcessor == "x86"
+#if Year == "2012"
Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+#endif
+#if Year == "2010"
Components: {#InstallerCondition}; Tasks: gac\vs2010; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx45 true -noVs2005 true -noVs2008 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+#endif
+#if Year == "2008"
Components: {#InstallerCondition}; Tasks: gac\vs2008; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx40 true -noNetFx45 true -noVs2005 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
+#endif
+#if Year == "2005"
Components: {#InstallerCondition}; Tasks: gac\vs2005; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGAC -tracePriority Lowest -verbose true -noCompact true -noNetFx40 true -noNetFx45 true -noVs2008 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
#endif
+#endif
+#if Year != "2005"
Components: Application\LINQ; Tasks: ngen; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
Components: Application\LINQ; Tasks: ngen; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() and CheckForNetFx35(1)
+#endif
+
Components: Application\Core\MSIL; Tasks: ngen; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
Components: Application\Core\MSIL; Tasks: ngen; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
[Dirs]
Name: {app}\bin
Name: {app}\doc
#if Pos("NativeOnly", AppConfiguration) == 0
-Name: {app}\GAC
+Name: {app}\GAC; Tasks: gac
#endif
[Files]
Components: Application\Core\{#AppProcessor}; Source: ..\Externals\MSVCPP\vcredist_{#AppProcessor}_{#VcRuntime}.exe; DestDir: {tmp}; Flags: dontcopy
Components: Application; Source: ..\readme.htm; DestDir: {app}; Flags: restartreplace uninsrestartdelete isreadme
@@ -123,16 +165,18 @@
#else
Components: Application\Core\MSIL; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Core\MSIL and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
#endif
+#if Year != "2005"
#if Pos("NativeOnly", AppConfiguration) == 0
Components: Application\LINQ; Tasks: gac; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.Linq.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite.Linq, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall
#endif
Components: Application\LINQ; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.Linq.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\LINQ and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.Linq.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
+#endif
#if Pos("NativeOnly", AppConfiguration) != 0
Components: Application\Core\{#AppProcessor}; Source: ..\bin\{#Year}\{#AppPlatform}\{#AppConfiguration}\SQLite.Interop.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Core\{#AppProcessor} and Application\Symbols; Source: ..\bin\{#Year}\{#AppPlatform}\{#AppConfiguration}\SQLite.Interop.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
#endif
@@ -143,14 +187,17 @@
Components: Application\Designer\Installer; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\Installer.exe; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Designer\Installer and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\Installer.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Test; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\test.exe; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Test and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\test.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Test; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\test.exe.config; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
+
+#if Year != "2005"
Components: Application\Test and Application\LINQ; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\testlinq.exe; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Test and Application\LINQ and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\testlinq.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Test and Application\LINQ; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\testlinq.exe.config; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
Components: Application\Test and Application\LINQ; Source: ..\testlinq\northwindEF.db; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
+#endif
[Icons]
Name: {group}\Test Application; Filename: {app}\bin\test.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\test.exe; Comment: Launch Test Application; IconIndex: 0; Flags: createonlyiffileexists
Name: {group}\Class Library Documentation; Filename: {app}\doc\SQLite.NET.chm; WorkingDir: {app}\doc; Comment: Launch Class Library Documentation; Flags: createonlyiffileexists
Name: {group}\README File; Filename: {app}\readme.htm; WorkingDir: {app}; Comment: View README File; Flags: createonlyiffileexists
ADDED Setup/set_2005.bat
Index: Setup/set_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_2005.bat
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+::
+:: set_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETFX20ONLY=1
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+
+VERIFY > NUL
Index: Setup/set_2008.bat
==================================================================
--- Setup/set_2008.bat
+++ Setup/set_2008.bat
@@ -6,9 +6,10 @@
:: Written by Joe Mistachkin.
:: Released to the public domain, use at your own risk!
::
SET NETFX20ONLY=
-SET NETFX40ONLY=
SET NETFX35ONLY=1
+SET NETFX40ONLY=
+SET NETFX45ONLY=
VERIFY > NUL
Index: Setup/set_2010.bat
==================================================================
--- Setup/set_2010.bat
+++ Setup/set_2010.bat
@@ -8,7 +8,8 @@
::
SET NETFX20ONLY=
SET NETFX35ONLY=
SET NETFX40ONLY=1
+SET NETFX45ONLY=
VERIFY > NUL
ADDED Setup/set_2012.bat
Index: Setup/set_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_2012.bat
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+::
+:: set_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=1
+
+VERIFY > NUL
ADDED Setup/set_ReleaseNativeOnly_x64_2005.bat
Index: Setup/set_ReleaseNativeOnly_x64_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_ReleaseNativeOnly_x64_2005.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_ReleaseNativeOnly_x64_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=ReleaseNativeOnly
+CALL "%~dp0\set_x64_2005.bat"
ADDED Setup/set_ReleaseNativeOnly_x64_2012.bat
Index: Setup/set_ReleaseNativeOnly_x64_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_ReleaseNativeOnly_x64_2012.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_ReleaseNativeOnly_x64_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=ReleaseNativeOnly
+CALL "%~dp0\set_x64_2012.bat"
ADDED Setup/set_ReleaseNativeOnly_x86_2005.bat
Index: Setup/set_ReleaseNativeOnly_x86_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_ReleaseNativeOnly_x86_2005.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_ReleaseNativeOnly_x86_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=ReleaseNativeOnly
+CALL "%~dp0\set_x86_2005.bat"
ADDED Setup/set_ReleaseNativeOnly_x86_2012.bat
Index: Setup/set_ReleaseNativeOnly_x86_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_ReleaseNativeOnly_x86_2012.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_ReleaseNativeOnly_x86_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=ReleaseNativeOnly
+CALL "%~dp0\set_x86_2012.bat"
ADDED Setup/set_Release_x64_2005.bat
Index: Setup/set_Release_x64_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_Release_x64_2005.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_Release_x64_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=Release
+CALL "%~dp0\set_x64_2005.bat"
ADDED Setup/set_Release_x64_2012.bat
Index: Setup/set_Release_x64_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_Release_x64_2012.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_Release_x64_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=Release
+CALL "%~dp0\set_x64_2012.bat"
ADDED Setup/set_Release_x86_2005.bat
Index: Setup/set_Release_x86_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_Release_x86_2005.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_Release_x86_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=Release
+CALL "%~dp0\set_x86_2005.bat"
ADDED Setup/set_Release_x86_2012.bat
Index: Setup/set_Release_x86_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_Release_x86_2012.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_Release_x86_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=Release
+CALL "%~dp0\set_x86_2012.bat"
Index: Setup/set_common.bat
==================================================================
--- Setup/set_common.bat
+++ Setup/set_common.bat
@@ -36,25 +36,41 @@
)
IF NOT DEFINED PROCESSORS (
SET PROCESSORS=x86 x64
)
+
+IF NOT DEFINED FRAMEWORK2005 (
+ SET FRAMEWORK2005=netFx20
+)
IF NOT DEFINED FRAMEWORK2008 (
SET FRAMEWORK2008=netFx35
)
IF NOT DEFINED FRAMEWORK2010 (
SET FRAMEWORK2010=netFx40
)
+
+IF NOT DEFINED FRAMEWORK2012 (
+ SET FRAMEWORK2012=netFx45
+)
IF DEFINED YEARS GOTO end_of_file
+
+IF DEFINED VS2005SP (
+ SET YEARS=%YEARS% 2005
+)
IF DEFINED VS2008SP (
SET YEARS=%YEARS% 2008
)
IF DEFINED VS2010SP (
SET YEARS=%YEARS% 2010
)
+
+IF DEFINED VS2012SP (
+ SET YEARS=%YEARS% 2012
+)
:end_of_file
ADDED Setup/set_netFx45.bat
Index: Setup/set_netFx45.bat
==================================================================
--- /dev/null
+++ Setup/set_netFx45.bat
@@ -0,0 +1,38 @@
+@ECHO OFF
+
+::
+:: set_netFx45.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+IF NOT DEFINED ISNETFX2 (
+ SET ISNETFX2=False
+)
+
+IF NOT DEFINED VCRUNTIME (
+ SET VCRUNTIME=2012_RTM
+)
+
+IF NOT DEFINED CONFIGURATION (
+ SET CONFIGURATION=Release
+)
+
+IF NOT DEFINED PLATFORM (
+ SET PLATFORM=Win32
+)
+
+IF NOT DEFINED PROCESSOR (
+ SET PROCESSOR=x86
+)
+
+IF NOT DEFINED YEAR (
+ SET YEAR=2012
+)
+
+IF NOT DEFINED FRAMEWORK (
+ SET FRAMEWORK=netFx45
+)
+
+:end_of_file
ADDED Setup/set_x64_2005.bat
Index: Setup/set_x64_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_x64_2005.bat
@@ -0,0 +1,14 @@
+@ECHO OFF
+
+::
+:: set_x64_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET ISNETFX2=True
+SET VCRUNTIME=2005_SP1
+SET PLATFORM=x64
+SET PROCESSOR=x64
+SET YEAR=2005
ADDED Setup/set_x64_2012.bat
Index: Setup/set_x64_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_x64_2012.bat
@@ -0,0 +1,14 @@
+@ECHO OFF
+
+::
+:: set_x64_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET ISNETFX2=False
+SET VCRUNTIME=2012_RTM
+SET PLATFORM=x64
+SET PROCESSOR=x64
+SET YEAR=2012
ADDED Setup/set_x86_2005.bat
Index: Setup/set_x86_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_x86_2005.bat
@@ -0,0 +1,14 @@
+@ECHO OFF
+
+::
+:: set_x86_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET ISNETFX2=True
+SET VCRUNTIME=2005_SP1
+SET PLATFORM=Win32
+SET PROCESSOR=x86
+SET YEAR=2005
ADDED Setup/set_x86_2012.bat
Index: Setup/set_x86_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_x86_2012.bat
@@ -0,0 +1,14 @@
+@ECHO OFF
+
+::
+:: set_x86_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET ISNETFX2=False
+SET VCRUNTIME=2012_RTM
+SET PLATFORM=Win32
+SET PROCESSOR=x86
+SET YEAR=2012
Index: Setup/verify.lst
==================================================================
--- Setup/verify.lst
+++ Setup/verify.lst
@@ -85,35 +85,50 @@
Setup/InitializeSetup.pas
Setup/release.bat
Setup/release_all.bat
Setup/release_ce.bat
Setup/release_static.bat
+ Setup/set_2005.bat
Setup/set_2008.bat
Setup/set_2010.bat
+ Setup/set_2012.bat
Setup/set_common.bat
Setup/set_netFx20.bat
Setup/set_netFx40.bat
+ Setup/set_netFx45.bat
Setup/set_Release.bat
Setup/set_ReleaseNativeOnly.bat
"Setup/set_ReleaseNativeOnly_Pocket PC 2003 (ARMV4).bat"
Setup/set_ReleaseNativeOnly_Win32.bat
Setup/set_ReleaseNativeOnly_x64.bat
+ Setup/set_ReleaseNativeOnly_x64_2005.bat
Setup/set_ReleaseNativeOnly_x64_2008.bat
Setup/set_ReleaseNativeOnly_x64_2010.bat
+ Setup/set_ReleaseNativeOnly_x64_2012.bat
+ Setup/set_ReleaseNativeOnly_x86_2005.bat
Setup/set_ReleaseNativeOnly_x86_2008.bat
Setup/set_ReleaseNativeOnly_x86_2010.bat
+ Setup/set_ReleaseNativeOnly_x86_2012.bat
"Setup/set_Release_Pocket PC 2003 (ARMV4).bat"
Setup/set_Release_Win32.bat
Setup/set_Release_x64.bat
+ Setup/set_Release_x64_2005.bat
Setup/set_Release_x64_2008.bat
Setup/set_Release_x64_2010.bat
+ Setup/set_Release_x64_2012.bat
+ Setup/set_Release_x86_2005.bat
Setup/set_Release_x86_2008.bat
Setup/set_Release_x86_2010.bat
+ Setup/set_Release_x86_2012.bat
+ Setup/set_x64_2005.bat
Setup/set_x64_2008.bat
Setup/set_x64_2010.bat
+ Setup/set_x64_2012.bat
+ Setup/set_x86_2005.bat
Setup/set_x86_2008.bat
Setup/set_x86_2010.bat
+ Setup/set_x86_2012.bat
Setup/SQLite.iss
Setup/test_all.bat
Setup/updateFileInfo.tcl
Setup/verify.eagle
Setup/verify.lst
Index: Setup/vsSp.bat
==================================================================
--- Setup/vsSp.bat
+++ Setup/vsSp.bat
@@ -1,11 +1,11 @@
@ECHO OFF
::
:: vsSp.bat --
::
-:: Visual Studio 2008/2010 Service Pack Detection Tool
+:: Visual Studio 2005/2008/2010/2012 Service Pack Detection Tool
::
:: Written by Joe Mistachkin.
:: Released to the public domain, use at your own risk!
::
@@ -21,10 +21,30 @@
SET DUMMY2=%1
IF DEFINED DUMMY2 (
GOTO usage
)
+
+REM
+REM NOTE: Build the command that we will use to query for Visual Studio 2005.
+REM Visual Studio 2005 is 32-bit only; therefore, when not running on an
+REM x86 platform, look in the WoW64 registry hive.
+REM
+IF "%PROCESSOR_ARCHITECTURE%" == "x86" (
+ SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Microsoft\DevDiv\VS\Servicing\8.0" /v SP
+) ELSE (
+ SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Wow6432Node\Microsoft\DevDiv\VS\Servicing\8.0" /v SP
+)
+
+FOR /F "eol=; tokens=1,2,3*" %%I IN ('%GET_SP_CMD% 2^> NUL') DO (
+ IF {%%I} == {SP} (
+ IF {%%J} == {REG_DWORD} (
+ %_AECHO% Found Visual Studio 2005 Service Pack "%%K".
+ SET VS2005SP=%%K
+ )
+ )
+)
REM
REM NOTE: Build the command that we will use to query for Visual Studio 2008.
REM Visual Studio 2008 is 32-bit only; therefore, when not running on an
REM x86 platform, look in the WoW64 registry hive.
@@ -61,10 +81,30 @@
%_AECHO% Found Visual Studio 2010 Service Pack "%%K".
SET VS2010SP=%%K
)
)
)
+
+REM
+REM NOTE: Build the command that we will use to query for Visual Studio 2012.
+REM Visual Studio 2012 is 32-bit only; therefore, when not running on an
+REM x86 platform, look in the WoW64 registry hive.
+REM
+IF "%PROCESSOR_ARCHITECTURE%" == "x86" (
+ SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Microsoft\DevDiv\VS\Servicing\11.0" /v SP
+) ELSE (
+ SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Wow6432Node\Microsoft\DevDiv\VS\Servicing\11.0" /v SP
+)
+
+FOR /F "eol=; tokens=1,2,3*" %%I IN ('%GET_SP_CMD% 2^> NUL') DO (
+ IF {%%I} == {SP} (
+ IF {%%J} == {REG_DWORD} (
+ %_AECHO% Found Visual Studio 2012 Service Pack "%%K".
+ SET VS2012SP=%%K
+ )
+ )
+)
GOTO no_errors
:fn_ResetErrorLevel
VERIFY > NUL
@@ -85,13 +125,15 @@
ENDLOCAL
GOTO end_of_file
:no_errors
ENDLOCAL && (
+ SET VS2005SP=%VS2005SP%
SET VS2008SP=%VS2008SP%
SET VS2010SP=%VS2010SP%
+ SET VS2012SP=%VS2012SP%
)
CALL :fn_ResetErrorLevel
GOTO end_of_file
:end_of_file
EXIT /B %ERRORLEVEL%
Index: System.Data.SQLite.Linq/System.Data.SQLite.Linq.2012.csproj
==================================================================
--- System.Data.SQLite.Linq/System.Data.SQLite.Linq.2012.csproj
+++ System.Data.SQLite.Linq/System.Data.SQLite.Linq.2012.csproj
@@ -18,10 +18,11 @@
System.Data.SQLite.Linq
System.Data.SQLite.Linq
Client
$(MSBuildProjectDirectory)\..
2012
+ v4.5
$(BinaryOutputPath)
$(BinaryOutputPath)System.Data.SQLite.Linq.xml
Index: System.Data.SQLite/System.Data.SQLite.2012.csproj
==================================================================
--- System.Data.SQLite/System.Data.SQLite.2012.csproj
+++ System.Data.SQLite/System.Data.SQLite.2012.csproj
@@ -18,10 +18,11 @@
System.Data.SQLite
System.Data.SQLite
Client
$(MSBuildProjectDirectory)\..
2012
+ v4.5
$(BinaryOutputPath)
$(BinaryOutputPath)System.Data.SQLite.xml
Index: System.Data.SQLite/System.Data.SQLite.Module.2012.csproj
==================================================================
--- System.Data.SQLite/System.Data.SQLite.Module.2012.csproj
+++ System.Data.SQLite/System.Data.SQLite.Module.2012.csproj
@@ -19,10 +19,11 @@
System.Data.SQLite
Client
false
$(MSBuildProjectDirectory)\..
2012
+ v4.5
Module
false
false
Index: Tests/common.eagle
==================================================================
--- Tests/common.eagle
+++ Tests/common.eagle
@@ -44,49 +44,49 @@
#
if {[info exists ::test_year] && [string length $::test_year] > 0} then {
#
# NOTE: Use the specified test year. If this variable is not set, the
# default value will be based on whether or not Eagle has been
- # compiled against the .NET Framework 2.0 or 4.0.
+ # compiled against the CLR v2.0 or CLR v4.0.
#
return $::test_year
} else {
#
- # NOTE: If Eagle has been compiled against the .NET Framework 4.0, use
- # "2010" by default (we could use "2012" in that case as well) as
- # the test year; otherwise, use "2008" by default (we could use
- # "2005" in that case as well). If another major [incompatible]
- # version of the .NET Framework is released, this check will have
- # to be changed. The default test year to use for a particular
- # .NET Framework version may be overridden using another global
- # variable (i.e. test_year_netFxYZ).
+ # NOTE: If Eagle has been compiled against the CLR v4.0, use "2010" by
+ # default (we could use "2012" in that case as well) as the test
+ # year; otherwise, use "2008" by default (we could use "2005" in
+ # that case as well). If another major [incompatible] version of
+ # the CLR is released, this check will have to be changed. The
+ # default test year to use for a particular CLR version may be
+ # overridden by setting the global variable "test_year_clr_v$X",
+ # where "$X" may [currently] be either "2" or "4".
#
if {[haveConstraint imageRuntime40]} then {
- if {[info exists ::test_year_netFx40] && \
- [string length $::test_year_netFx40] > 0} then {
- #
- # NOTE: Use the specified test year for the .NET Framework 4.0.
- #
- return $::test_year_netFx40
- } else {
- #
- # NOTE: Use the default test year for the .NET Framework 4.0.
- #
- return 2010
- }
- } else {
- if {[info exists ::test_year_netFx20] && \
- [string length $::test_year_netFx20] > 0} then {
- #
- # NOTE: Use the specified test year for the .NET Framework 2.0.
- #
- return $::test_year_netFx20
- } else {
- #
- # NOTE: Use the default test year for the .NET Framework 2.0.
- #
- return 2008
+ if {[info exists ::test_year_clr_v4] && \
+ [string length $::test_year_clr_v4] > 0} then {
+ #
+ # NOTE: Use the specified test year for the CLR v4.0.
+ #
+ return $::test_year_clr_v4
+ } else {
+ #
+ # NOTE: Use the default test year for the CLR v4.0.
+ #
+ return 2010; # TODO: Good "fallback" default?
+ }
+ } else {
+ if {[info exists ::test_year_clr_v2] && \
+ [string length $::test_year_clr_v2] > 0} then {
+ #
+ # NOTE: Use the specified test year for the CLR v2.0.
+ #
+ return $::test_year_clr_v2
+ } else {
+ #
+ # NOTE: Use the default test year for the CLR v2.0.
+ #
+ return 2008; # TODO: Good "fallback" default?
}
}
}
}
Index: Tests/tkt-2ce0870fad.eagle
==================================================================
--- Tests/tkt-2ce0870fad.eagle
+++ Tests/tkt-2ce0870fad.eagle
@@ -42,12 +42,12 @@
# NOTE: Keep track of whether or not the global test year and configuration
# variables already exist in the primary application domain before the
# test. If not, we will need to unset them after the test.
#
set hadTestYear {[info exists ::test_year]}
- set hadTestYearNetFx20 {[info exists ::test_year_netFx20]}
- set hadTestYearNetFx40 {[info exists ::test_year_netFx40]}
+ set hadTestYearClrV2 {[info exists ::test_year_clr_v2]}
+ set hadTestYearClrV4 {[info exists ::test_year_clr_v4]}
set hadTestConfiguration {[info exists ::test_configuration]}
}] -body {
set appDomainId(3) [object invoke AppDomain.CurrentDomain Id]
package require Eagle.Library
@@ -67,16 +67,16 @@
if {!$hadTestConfiguration} then {
unset -nocomplain ::test_configuration
}
- if {!$hadTestYearNetFx40} then {
- unset -nocomplain ::test_year_netFx40
+ if {!$hadTestYearClrV4} then {
+ unset -nocomplain ::test_year_clr_v4
}
- if {!$hadTestYearNetFx20} then {
- unset -nocomplain ::test_year_netFx20
+ if {!$hadTestYearClrV2} then {
+ unset -nocomplain ::test_year_clr_v2
}
if {!$hadTestYear} then {
unset -nocomplain ::test_year
}
Index: test/test.2012.csproj
==================================================================
--- test/test.2012.csproj
+++ test/test.2012.csproj
@@ -18,10 +18,11 @@
test
test
Client
$(MSBuildProjectDirectory)\..
2012
+ v4.5
$(BinaryOutputPath)
Index: testlinq/testlinq.2012.csproj
==================================================================
--- testlinq/testlinq.2012.csproj
+++ testlinq/testlinq.2012.csproj
@@ -17,10 +17,11 @@
testlinq
testlinq
Client
$(MSBuildProjectDirectory)\..
2012
+ v4.5
$(BinaryOutputPath)
Index: tools/install/Installer.2012.csproj
==================================================================
--- tools/install/Installer.2012.csproj
+++ tools/install/Installer.2012.csproj
@@ -18,10 +18,11 @@
Installer
true
Client
$(MSBuildProjectDirectory)\..\..
2012
+ v4.5
$(BinaryOutputPath)