Index: Externals/Eagle/lib/Eagle1.0/vendor.eagle ================================================================== --- Externals/Eagle/lib/Eagle1.0/vendor.eagle +++ Externals/Eagle/lib/Eagle1.0/vendor.eagle @@ -433,10 +433,16 @@ # set no(emitLocalFlagsIfNone) 1 set no(emitSharedFlagsIfNone) 1 set no(emitGlobalFlagsIfNone) 1 set no(emitCombinedFlagsIfNone) 1 + + # + # NOTE: Force use of the native library pre-loader when applicable. + # + set no(deleteSqliteImplicitNativeFiles) 1 + set no(copySqliteImplicitNativeFiles) 1 } } ############################################################################### ############################### END VENDOR CODE ############################### Index: SQLite.Interop/SQLite.Interop.2010.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.2010.vcxproj +++ SQLite.Interop/SQLite.Interop.2010.vcxproj @@ -167,15 +167,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -211,15 +213,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -249,15 +253,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -287,15 +294,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -333,15 +343,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -379,15 +391,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -420,15 +434,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -461,15 +478,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.2012.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.2012.vcxproj +++ SQLite.Interop/SQLite.Interop.2012.vcxproj @@ -174,15 +174,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -218,15 +220,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -256,15 +260,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -294,15 +301,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -340,15 +350,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -386,15 +398,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -427,15 +441,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -468,15 +485,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.2013.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.2013.vcxproj +++ SQLite.Interop/SQLite.Interop.2013.vcxproj @@ -174,15 +174,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -218,15 +220,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -256,15 +260,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -294,15 +301,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -340,15 +350,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -386,15 +398,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -427,15 +441,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -468,15 +485,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.2015.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.2015.vcxproj +++ SQLite.Interop/SQLite.Interop.2015.vcxproj @@ -174,15 +174,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -218,15 +220,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -256,15 +260,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -294,15 +301,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -340,15 +350,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -386,15 +398,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -427,15 +441,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -468,15 +485,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.Static.2010.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.Static.2010.vcxproj +++ SQLite.Interop/SQLite.Interop.Static.2010.vcxproj @@ -167,15 +167,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -211,15 +213,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -249,15 +253,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -287,15 +294,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -333,15 +343,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -379,15 +391,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -420,15 +434,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -461,15 +478,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.Static.2012.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.Static.2012.vcxproj +++ SQLite.Interop/SQLite.Interop.Static.2012.vcxproj @@ -174,15 +174,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -218,15 +220,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -256,15 +260,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -294,15 +301,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -340,15 +350,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -386,15 +398,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -427,15 +441,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -468,15 +485,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.Static.2013.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.Static.2013.vcxproj +++ SQLite.Interop/SQLite.Interop.Static.2013.vcxproj @@ -174,15 +174,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -218,15 +220,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -256,15 +260,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -294,15 +301,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -340,15 +350,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -386,15 +398,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -427,15 +441,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -468,15 +485,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: SQLite.Interop/SQLite.Interop.Static.2015.vcxproj ================================================================== --- SQLite.Interop/SQLite.Interop.Static.2015.vcxproj +++ SQLite.Interop/SQLite.Interop.Static.2015.vcxproj @@ -174,15 +174,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -218,15 +220,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -256,15 +260,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Disabled $(INTEROP_INCLUDE_DIRECTORIES);%(AdditionalIncludeDirectories) WIN32;x64;_DEBUG;_WINDOWS;_USRDLL;$(SQLITE_COMMON_DEFINES);$(SQLITE_EXTRA_DEFINES);$(SQLITE_DEBUG_DEFINES);$(INTEROP_EXTRA_DEFINES);$(INTEROP_DEBUG_DEFINES);%(PreprocessorDefinitions) @@ -294,15 +301,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Debug\bin\" /D /E /V /I /F /H /Y - + + Debug + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -340,15 +350,17 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -386,15 +398,17 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - "$(FrameworkSDKDir)Bin\sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - "$(TargetFrameworkSDKToolsDirectory)sn.exe" -Ra "$(TargetPath)" "$(INTEROP_KEY_FILE)" - + + + $(AfterBuildLinkTargets); + ReSignMixedModeAssembly; + + Full true Speed @@ -427,15 +441,18 @@ true $(ProjectName), processorArchitecture=x86, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + Full true Speed @@ -468,15 +485,18 @@ true $(ProjectName), processorArchitecture=amd64, version=$(INTEROP_MANIFEST_VERSION), type=win32 true - - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\$(Platform)\" /D /E /V /I /F /H /Y - XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\Release\bin\" /D /E /V /I /F /H /Y - + + Release + + $(AfterBuildLinkTargets); + CopyInteropAssembly; + + true Index: Targets/SQLite.NET.targets ================================================================== --- Targets/SQLite.NET.targets +++ Targets/SQLite.NET.targets @@ -219,6 +219,43 @@ + + + + + + + + + + + + + + + + Index: Tests/basic.eagle ================================================================== --- Tests/basic.eagle +++ Tests/basic.eagle @@ -60,16 +60,11 @@ testExec winForms} -result {0 {}}} ############################################################################### runTest {test data-1.2 {unit tests from the 'testlinq' project} -setup { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles # # NOTE: We need to make 100% sure that the console output encoding is the # same as when the 'testlinq.out' file was created. # @@ -101,16 +96,11 @@ file_testlinq.out testExec} -result {0 True {}}} ############################################################################### runTest {test data-1.3 {unit tests from the 'testef6' project} -setup { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles # # NOTE: We need to make 100% sure that the console output encoding is the # same as when the 'testlinq.out' file was created. # @@ -3190,16 +3180,11 @@ {DetectTextAffinity, DetectStringType}}} ############################################################################### runTest {test data-1.70 {LINQ w/String.Substring Method} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/data/Installer_Test_Vs2005.log ================================================================== --- Tests/data/Installer_Test_Vs2005.log +++ Tests/data/Installer_Test_Vs2005.log @@ -1,14 +1,14 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", subKeyName = "SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory false]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = Installer.exe: #[getLineNumber]: Installer.AddDbProviderFactory: addElement = @@ -17,11 +17,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", subKeyName = "Packages", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages", subKeyName = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = , value = "System.Data.SQLite Designer Package" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "Class", value = "SQLite.Designer.SQLitePackage" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ID", value = 400 Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "InprocServer32", value = "[file nativename [file join $::env(windir) [expr {$is64 ? "SysWOW64" : "system32"}] mscoree.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CompanyName", value = "https://system.data.sqlite.org/" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "MinEdition", value = "standard" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ProductName", value = "System.Data.SQLite Designer Package" @@ -50,11 +50,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = , value = ".NET Framework Data Provider for SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Assembly", value = "SQLite.Designer, Version=[file version $sqliteDesignerDllFile], Culture=neutral, PublicKeyToken=db937bc2d44ff139" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "AssociatedSource", value = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c71}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "InvariantName", value = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Technology", value = "{77ab9a9d-78b9-4ba7-91ac-873f5338f1d2}" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "FactoryService", value = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9d}" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionUIControl" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Index: Tests/data/Installer_Test_Vs2008.log ================================================================== --- Tests/data/Installer_Test_Vs2008.log +++ Tests/data/Installer_Test_Vs2008.log @@ -1,21 +1,21 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", subKeyName = "SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory false]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v3.5", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx", subKeyName = "SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory false]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = Installer.exe: #[getLineNumber]: Installer.AddDbProviderFactory: addElement = @@ -27,11 +27,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", subKeyName = "Packages", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages", subKeyName = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = , value = "System.Data.SQLite Designer Package" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "Class", value = "SQLite.Designer.SQLitePackage" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ID", value = 400 Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "InprocServer32", value = "[file nativename [file join $::env(windir) [expr {$is64 ? "SysWOW64" : "system32"}] mscoree.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CompanyName", value = "https://system.data.sqlite.org/" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "MinEdition", value = "standard" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ProductName", value = "System.Data.SQLite Designer Package" @@ -60,11 +60,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = , value = ".NET Framework Data Provider for SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Assembly", value = "SQLite.Designer, Version=[file version $sqliteDesignerDllFile], Culture=neutral, PublicKeyToken=db937bc2d44ff139" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "AssociatedSource", value = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c71}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "InvariantName", value = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Technology", value = "{77ab9a9d-78b9-4ba7-91ac-873f5338f1d2}" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "FactoryService", value = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9d}" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionUIControl" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Index: Tests/data/Installer_Test_Vs2010.log ================================================================== --- Tests/data/Installer_Test_Vs2010.log +++ Tests/data/Installer_Test_Vs2010.log @@ -1,17 +1,17 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx", subKeyName = "SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory false]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = Installer.exe: #[getLineNumber]: Installer.AddDbProviderFactory: addElement = @@ -20,11 +20,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", subKeyName = "Packages", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages", subKeyName = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = , value = "System.Data.SQLite Designer Package" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "Class", value = "SQLite.Designer.SQLitePackage" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ID", value = 400 Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "InprocServer32", value = "[file nativename [file join $::env(windir) [expr {$is64 ? "SysWOW64" : "system32"}] mscoree.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CompanyName", value = "https://system.data.sqlite.org/" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "MinEdition", value = "standard" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ProductName", value = "System.Data.SQLite Designer Package" @@ -53,11 +53,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = , value = ".NET Framework Data Provider for SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Assembly", value = "SQLite.Designer, Version=[file version $sqliteDesignerDllFile], Culture=neutral, PublicKeyToken=db937bc2d44ff139" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "AssociatedSource", value = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c71}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "InvariantName", value = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Technology", value = "{77ab9a9d-78b9-4ba7-91ac-873f5338f1d2}" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "FactoryService", value = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9d}" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionUIControl" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Index: Tests/data/Installer_Test_Vs2012.log ================================================================== --- Tests/data/Installer_Test_Vs2012.log +++ Tests/data/Installer_Test_Vs2012.log @@ -1,17 +1,17 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.50709", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx", subKeyName = "SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory false]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = Installer.exe: #[getLineNumber]: Installer.AddDbProviderFactory: addElement = @@ -20,11 +20,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", subKeyName = "Packages", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages", subKeyName = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = , value = "System.Data.SQLite Designer Package" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "Class", value = "SQLite.Designer.SQLitePackage" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ID", value = 400 Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "InprocServer32", value = "[file nativename [file join $::env(windir) [expr {$is64 ? "SysWOW64" : "system32"}] mscoree.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CompanyName", value = "https://system.data.sqlite.org/" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "MinEdition", value = "standard" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ProductName", value = "System.Data.SQLite Designer Package" @@ -53,11 +53,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = , value = ".NET Framework Data Provider for SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Assembly", value = "SQLite.Designer, Version=[file version $sqliteDesignerDllFile], Culture=neutral, PublicKeyToken=db937bc2d44ff139" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "AssociatedSource", value = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c71}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "InvariantName", value = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Technology", value = "{77ab9a9d-78b9-4ba7-91ac-873f5338f1d2}" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "FactoryService", value = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9d}" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionUIControl" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Index: Tests/data/Installer_Test_Vs2013.log ================================================================== --- Tests/data/Installer_Test_Vs2013.log +++ Tests/data/Installer_Test_Vs2013.log @@ -1,17 +1,17 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.1", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx", subKeyName = "SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx\System.Data.SQLite", name = , value = "[file nativename [getBuildDirectory false]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = Installer.exe: #[getLineNumber]: Installer.AddDbProviderFactory: addElement = @@ -20,11 +20,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", subKeyName = "Packages", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages", subKeyName = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = , value = "System.Data.SQLite Designer Package" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "Class", value = "SQLite.Designer.SQLitePackage" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ID", value = 400 Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "InprocServer32", value = "[file nativename [file join $::env(windir) [expr {$is64 ? "SysWOW64" : "system32"}] mscoree.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CompanyName", value = "https://system.data.sqlite.org/" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "MinEdition", value = "standard" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ProductName", value = "System.Data.SQLite Designer Package" @@ -53,11 +53,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = , value = ".NET Framework Data Provider for SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Assembly", value = "SQLite.Designer, Version=[file version $sqliteDesignerDllFile], Culture=neutral, PublicKeyToken=db937bc2d44ff139" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "AssociatedSource", value = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c71}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "InvariantName", value = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Technology", value = "{77ab9a9d-78b9-4ba7-91ac-873f5338f1d2}" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "FactoryService", value = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9d}" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionUIControl" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Index: Tests/data/Installer_Test_Vs2015.log ================================================================== --- Tests/data/Installer_Test_Vs2015.log +++ Tests/data/Installer_Test_Vs2015.log @@ -1,11 +1,11 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.6", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = @@ -15,11 +15,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\14.0", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0", subKeyName = "Packages", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages", subKeyName = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = , value = "System.Data.SQLite Designer Package" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "Class", value = "SQLite.Designer.SQLitePackage" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ID", value = 400 Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "InprocServer32", value = "[file nativename [file join $::env(windir) [expr {$is64 ? "SysWOW64" : "system32"}] mscoree.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "CompanyName", value = "https://system.data.sqlite.org/" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "MinEdition", value = "standard" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\Packages\{dcbe6c8d-0e57-4099-a183-98ff74c64d9c}", name = "ProductName", value = "System.Data.SQLite Designer Package" @@ -48,11 +48,11 @@ Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = , value = ".NET Framework Data Provider for SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Assembly", value = "SQLite.Designer, Version=[file version $sqliteDesignerDllFile], Culture=neutral, PublicKeyToken=db937bc2d44ff139" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "AssociatedSource", value = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c71}" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "InvariantName", value = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "Technology", value = "{77ab9a9d-78b9-4ba7-91ac-873f5338f1d2}" -Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "CodeBase", value = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.SetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", name = "FactoryService", value = "{dcbe6c8d-0e57-4099-a183-98ff74c64d9d}" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionUIControl" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #[getLineNumber]: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\14.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Index: Tests/data/Uninstaller_Test_Vs2005.log ================================================================== --- Tests/data/Uninstaller_Test_Vs2005.log +++ Tests/data/Uninstaller_Test_Vs2005.log @@ -1,8 +1,8 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Index: Tests/data/Uninstaller_Test_Vs2008.log ================================================================== --- Tests/data/Uninstaller_Test_Vs2008.log +++ Tests/data/Uninstaller_Test_Vs2008.log @@ -1,9 +1,9 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v3.5", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx", writable = True Index: Tests/data/Uninstaller_Test_Vs2010.log ================================================================== --- Tests/data/Uninstaller_Test_Vs2010.log +++ Tests/data/Uninstaller_Test_Vs2010.log @@ -1,11 +1,11 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Index: Tests/data/Uninstaller_Test_Vs2012.log ================================================================== --- Tests/data/Uninstaller_Test_Vs2012.log +++ Tests/data/Uninstaller_Test_Vs2012.log @@ -1,11 +1,11 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.50709", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Index: Tests/data/Uninstaller_Test_Vs2013.log ================================================================== --- Tests/data/Uninstaller_Test_Vs2013.log +++ Tests/data/Uninstaller_Test_Vs2013.log @@ -1,11 +1,11 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.1", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx", writable = True Installer.exe: #[getLineNumber]: RegistryHelper.DeleteSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework\v4.5.1\AssemblyFoldersEx", subKeyName = "System.Data.SQLite" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Index: Tests/data/Uninstaller_Test_Vs2015.log ================================================================== --- Tests/data/Uninstaller_Test_Vs2015.log +++ Tests/data/Uninstaller_Test_Vs2015.log @@ -1,11 +1,11 @@ Installer.exe: #[getLineNumber]: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. -Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory] EntityFramework.dll]]". -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" -Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" +Installer.exe: #[getLineNumber]: Configuration.IsSystemEf6AssemblyAvailable: Entity Framework 6 assembly was resolved to "[file nativename [file join [getBuildDirectory false] EntityFramework.dll]]". +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] SQLite.Designer.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.EF6.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.Linq.dll]]" +Installer.exe: #[getLineNumber]: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory false] System.Data.SQLite.dll]]" Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.6", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework\v4.0.30319", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\.NETFramework", writable = False Installer.exe: #[getLineNumber]: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\.NETFramework", name = "InstallRoot", defaultValue = Installer.exe: #[getLineNumber]: Installer.RemoveDbProviderFactory: addElement = , removeElement = Index: Tests/installer.eagle ================================================================== --- Tests/installer.eagle +++ Tests/installer.eagle @@ -38,13 +38,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx35 true \ -noNetFx40 true -noNetFx45 true -noNetFx451 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2008 true -noVs2010 true \ - -noVs2012 true -noVs2013 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install true -debug true -wow64 true \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2008 true \ + -noVs2010 true -noVs2012 true -noVs2013 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install true -debug true \ + -wow64 true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -79,13 +80,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx35 true \ -noNetFx40 true -noNetFx45 true -noNetFx451 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2008 true -noVs2010 true \ - -noVs2012 true -noVs2013 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install false -debug true -wow64 true \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2008 true \ + -noVs2010 true -noVs2012 true -noVs2013 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install false -debug true \ + -wow64 true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -120,13 +122,13 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx40 true \ -noNetFx45 true -noNetFx451 true -noNetFx452 true -noNetFx46 true \ - -noNetFx461 true -noVs2005 true -noVs2010 true -noVs2012 true \ - -noVs2013 true -noVs2015 true -whatIf true -verbose true \ - -confirm true -install true -debug true -wow64 true \ + -noNetFx461 true -noNetFx462 true -noVs2005 true -noVs2010 true \ + -noVs2012 true -noVs2013 true -noVs2015 true -whatIf true \ + -verbose true -confirm true -install true -debug true -wow64 true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -161,13 +163,13 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx40 true \ -noNetFx45 true -noNetFx451 true -noNetFx452 true -noNetFx46 true \ - -noNetFx461 true -noVs2005 true -noVs2010 true -noVs2012 true \ - -noVs2013 true -noVs2015 true -whatIf true -verbose true \ - -confirm true -install false -debug true -wow64 true \ + -noNetFx461 true -noNetFx462 true -noVs2005 true -noVs2010 true \ + -noVs2012 true -noVs2013 true -noVs2015 true -whatIf true \ + -verbose true -confirm true -install false -debug true -wow64 true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -202,13 +204,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx45 true -noNetFx451 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2012 true -noVs2013 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install true -debug true -wow64 true \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2012 true -noVs2013 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install true -debug true \ + -wow64 true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -244,13 +247,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx45 true -noNetFx451 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2012 true -noVs2013 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install false -debug true -wow64 true \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2012 true -noVs2013 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install false -debug true \ + -wow64 true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -286,14 +290,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx40 true -noNetFx451 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2010 true -noVs2013 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install true -debug true -wow64 true \ - -configVersion 4.0.30319 \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2010 true -noVs2013 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install true -debug true \ + -wow64 true -configVersion 4.0.30319 \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -329,14 +333,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx40 true -noNetFx451 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2010 true -noVs2013 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install false -debug true -wow64 true \ - -configVersion 4.0.30319 \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2010 true -noVs2013 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install false -debug true \ + -wow64 true -configVersion 4.0.30319 \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -372,14 +376,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx40 true -noNetFx45 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2010 true -noVs2012 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install true -debug true -wow64 true \ - -configVersion 4.0.30319 \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2010 true -noVs2012 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install true -debug true \ + -wow64 true -configVersion 4.0.30319 \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -415,14 +419,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx40 true -noNetFx45 true -noNetFx452 true \ - -noNetFx46 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2010 true -noVs2012 true -noVs2015 true -whatIf true \ - -verbose true -confirm true -install false -debug true -wow64 true \ - -configVersion 4.0.30319 \ + -noNetFx46 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2010 true -noVs2012 true -noVs2015 true \ + -whatIf true -verbose true -confirm true -install false -debug true \ + -wow64 true -configVersion 4.0.30319 \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -458,14 +462,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx40 true -noNetFx45 true -noNetFx451 true \ - -noNetFx452 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2010 true -noVs2012 true -noVs2013 true -whatIf true \ - -verbose true -confirm true -install true -debug true -wow64 true \ - -configVersion 4.0.30319 \ + -noNetFx452 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2010 true -noVs2012 true -noVs2013 true \ + -whatIf true -verbose true -confirm true -install true -debug true \ + -wow64 true -configVersion 4.0.30319 \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -501,14 +505,14 @@ set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true \ -noNetFx35 true -noNetFx40 true -noNetFx45 true -noNetFx451 true \ - -noNetFx452 true -noNetFx461 true -noVs2005 true -noVs2008 true \ - -noVs2010 true -noVs2012 true -noVs2013 true -whatIf true \ - -verbose true -confirm true -install false -debug true -wow64 true \ - -configVersion 4.0.30319 \ + -noNetFx452 true -noNetFx461 true -noNetFx462 true -noVs2005 true \ + -noVs2008 true -noVs2010 true -noVs2012 true -noVs2013 true \ + -whatIf true -verbose true -confirm true -install false -debug true \ + -wow64 true -configVersion 4.0.30319 \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" Index: Tests/linq.eagle ================================================================== --- Tests/linq.eagle +++ Tests/linq.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test linq-1.1 {DbUpdateCommandTree with UPDATE and SELECT} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -58,16 +53,11 @@ -result {0 {inserted 1 updated 1}}} ############################################################################### runTest {test linq-1.2 {ROUND function with two arguments} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/tkt-00f86f9739.eagle ================================================================== --- Tests/tkt-00f86f9739.eagle +++ Tests/tkt-00f86f9739.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-00f86f9739-1.1 {LINQ with StartsWith} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" @@ -65,16 +60,11 @@ {}}} ############################################################################### runTest {test tkt-00f86f9739-1.2 {EF6 with StartsWith} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" Index: Tests/tkt-0a32885109.eagle ================================================================== --- Tests/tkt-0a32885109.eagle +++ Tests/tkt-0a32885109.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-0a32885109-1.1 {LINQ compound-operator handling} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/tkt-41aea496e0.eagle ================================================================== --- Tests/tkt-41aea496e0.eagle +++ Tests/tkt-41aea496e0.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-41aea496e0-1.1 {LINQ non-rowid primary key support} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/tkt-58ed318f2f.eagle ================================================================== --- Tests/tkt-58ed318f2f.eagle +++ Tests/tkt-58ed318f2f.eagle @@ -450,19 +450,21 @@ INSERT INTO t1 (x) VALUES(0); } sql execute -execute reader -format list $db "SELECT x FROM t1;" - expr {[getSettingReadCount ""] eq ([isMono] ? "10 15" : "10 13") && \ + set counts [getSettingReadCount ""] + + expr {[lindex $counts 0] > 0 && [lindex $counts 1] > 0 && \ [getSettingReadCount "" true] eq "0 0"} } -cleanup { cleanupDb $fileName restoreGetSettingValueEnvironment - unset -nocomplain db fileName + unset -nocomplain counts db fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ -System.Data.SQLite SQLiteInterop buildConfiguration.Debug} -result {True}} +System.Data.SQLite buildConfiguration.Debug} -result {True}} ############################################################################### rename getSettingReadCount "" Index: Tests/tkt-59edc1018b.eagle ================================================================== --- Tests/tkt-59edc1018b.eagle +++ Tests/tkt-59edc1018b.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-59edc1018b-1.1 {LINQ with EndsWith} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" @@ -64,16 +59,11 @@ WOLZA} 0 {} 0 ERNSH 0 {} 0 {AROUT BSBEV CONSH EASTC NORTS SEVES} 0 {}}} ############################################################################### runTest {test tkt-59edc1018b-1.2 {EF6 with EndsWith} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" Index: Tests/tkt-8b7d179c3c.eagle ================================================================== --- Tests/tkt-8b7d179c3c.eagle +++ Tests/tkt-8b7d179c3c.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-8b7d179c3c-1.1 {LINQ with Skip and Take} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] for {set pageSize 0} {$pageSize <= 2} {incr pageSize} { set output "" @@ -75,16 +70,11 @@ LACOR LAZYK WOLZA VAFFE}}} ############################################################################### runTest {test tkt-8b7d179c3c-1.2 {EF6 with Skip and Take} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] for {set pageSize 0} {$pageSize <= 2} {incr pageSize} { set output "" Index: Tests/tkt-8d928c3e88.eagle ================================================================== --- Tests/tkt-8d928c3e88.eagle +++ Tests/tkt-8d928c3e88.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-8d928c3e88-1.1 {LINQ w/BinaryGUID=false} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -58,16 +53,11 @@ -result {0 2d3d2d3d-2d3d-2d3d-2d3d-2d3d2d3d2d3d}} ############################################################################### runTest {test tkt-8d928c3e88-1.2 {LINQ w/BinaryGUID=true} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -96,16 +86,11 @@ -result {0 =-=-=-=--=-=-=-=}} ############################################################################### runTest {test tkt-8d928c3e88-2.1 {LINQ w/DateTimeFormat=Ticks} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -135,16 +120,11 @@ {\sWHERE \[Extent1\]\.\[OrderDate\] < 629876736000000000\s}} ############################################################################### runTest {test tkt-8d928c3e88-2.2 {LINQ w/DateTimeFormat=JulianDay} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -173,16 +153,11 @@ -match regexp -result {\sWHERE \[Extent1\]\.\[OrderDate\] < 2450449\.5\s}} ############################################################################### runTest {test tkt-8d928c3e88-2.3 {LINQ w/DateTimeFormat=UnixEpoch} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -211,16 +186,11 @@ -match regexp -result {\sWHERE \[Extent1\]\.\[OrderDate\] < 852076800\s}} ############################################################################### runTest {test tkt-8d928c3e88-2.4 {LINQ w/DateTimeFormat=ISO8601} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/tkt-9d353b0bd8.eagle ================================================================== --- Tests/tkt-9d353b0bd8.eagle +++ Tests/tkt-9d353b0bd8.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-9d353b0bd8-1.1 {DbModificationCommandTree w/INSERT} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/tkt-a4d9c7ee94.eagle ================================================================== --- Tests/tkt-a4d9c7ee94.eagle +++ Tests/tkt-a4d9c7ee94.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-a4d9c7ee94-1.1 {LINQ w/BinaryGUID=false} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -69,16 +64,11 @@ 98104}}} ############################################################################### runTest {test tkt-a4d9c7ee94-1.2 {LINQ w/BinaryGUID=true} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: Tests/tkt-ccfa69fc32.eagle ================================================================== --- Tests/tkt-ccfa69fc32.eagle +++ Tests/tkt-ccfa69fc32.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-ccfa69fc32-1.1 {LINQ Transaction Scope} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] foreach add [list false true false] { set output "" @@ -65,16 +60,11 @@ 1580 1581 1730 1833 2116 2139}}} ############################################################################### runTest {test tkt-ccfa69fc32-1.2 {EF6 Transaction Scope} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] foreach add [list false true false] { set output "" Index: Tests/tkt-da9f18d039.eagle ================================================================== --- Tests/tkt-da9f18d039.eagle +++ Tests/tkt-da9f18d039.eagle @@ -20,16 +20,11 @@ runSQLiteTestFilesPrologue ############################################################################### runTest {test tkt-da9f18d039-1.1 {LINQ DateTime handling} -body { - # - # NOTE: Re-copy the reference database file used for this unit test to the - # build directory in case it has been changed by a previous test run. - # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { @@ -62,12 +57,11 @@ runTest {test tkt-da9f18d039-1.2 {EF6 DateTime handling} -body { # # NOTE: Re-copy the reference database file used for this unit test to the # build directory in case it has been changed by a previous test run. # - file copy -force $northwindEfDbFile \ - [file join [getBuildDirectory] [file tail $northwindEfDbFile]] + copySampleDatabaseFiles set result [list] set output "" set code [catch { Index: lib/System.Data.SQLite/common.eagle ================================================================== --- lib/System.Data.SQLite/common.eagle +++ lib/System.Data.SQLite/common.eagle @@ -704,11 +704,11 @@ } else { return [file join $path bin $year $configuration bin] } } - proc getBuildDirectory {} { + proc getBuildDirectory { managedOnly } { # # NOTE: See if the "native" runtime option has been set. If so, use the # directory for the mixed-mode assembly (a.k.a. the native interop # assembly). To enable this option via the command line, enter a # command similar to one of the following (all on one line): @@ -770,11 +770,11 @@ # the latest version of MSBuild available and the "test_year" may # need to be adjusted accordingly to actually run the test suite. # Refer to the comments in [getBuildYear] for more information on # how to set this variable. # - set native [hasRuntimeOption native] + set native [expr {!$managedOnly && [hasRuntimeOption native]}] return [joinBuildDirectory $native [getBuildBaseDirectory] \ [getBuildYear] [getBuildPlatform $native] [getBuildConfiguration]] } } @@ -799,18 +799,19 @@ # return "" } } - proc getBuildFileName { fileName {platform ""} } { + proc getBuildFileName { fileName managedOnly {platform ""} } { # # NOTE: Returns the specified file name as if it were located in the # build directory, discarding any directory information present # in the file name as provided by our caller. # set result [file nativename \ - [file join [getBuildDirectory] $platform [file tail $fileName]]] + [file join [getBuildDirectory $managedOnly] $platform \ + [file tail $fileName]]] # # HACK: When running on WoW64, assume the test executables are present # with the "32" suffix on them. # @@ -1269,11 +1270,12 @@ "\" to \"" $targetFileName \"\n] } } proc tryCopyBinaryFile { - fileName {platform ""} {newFileName ""} {verbose true} } { + fileName managedOnly {platform ""} {newFileName ""} + {verbose true} } { set sourceFileName [getBinaryFileName $fileName $platform] if {![file exists $sourceFileName]} then { if {$verbose} then { tputs $::test_channel [appendArgs \ @@ -1283,13 +1285,15 @@ return } if {[string length $newFileName] > 0} then { - set targetFileName [getBuildFileName $newFileName $platform] + set targetFileName [getBuildFileName \ + $newFileName $managedOnly $platform] } else { - set targetFileName [getBuildFileName $fileName $platform] + set targetFileName [getBuildFileName \ + $fileName $managedOnly $platform] } set targetDirectory [file dirname $targetFileName] if {[catch { @@ -1308,12 +1312,13 @@ "\" to \"" $targetFileName \"\n] } } proc tryCopyBuildFile { - fileName {platform ""} {newFileName ""} {verbose true} } { - set sourceFileName [getBuildFileName $fileName $platform] + fileName managedOnly {platform ""} {newFileName ""} + {verbose true} } { + set sourceFileName [getBuildFileName $fileName $managedOnly $platform] if {![file exists $sourceFileName]} then { if {$verbose} then { tputs $::test_channel [appendArgs \ "---- skipped copying build file \"" $sourceFileName \ @@ -1368,12 +1373,13 @@ tputs $::test_channel [appendArgs \ "---- failed to delete binary file \"" $fileName \"\n] } } - proc tryDeleteBuildFile { fileName {platform ""} {verbose true} } { - set fileName [getBuildFileName $fileName $platform] + proc tryDeleteBuildFile { + fileName managedOnly {platform ""} {verbose true} } { + set fileName [getBuildFileName $fileName $managedOnly $platform] if {![file exists $fileName]} then { if {$verbose} then { tputs $::test_channel [appendArgs \ "---- skipped deleting build file \"" $fileName \ @@ -1391,16 +1397,16 @@ "---- failed to delete build file \"" $fileName \"\n] } } proc tryCopyAssembly { - fileName {platform ""} {pdb true} {verbose true} } { - tryCopyBuildFile $fileName $platform "" $verbose + fileName managedOnly {platform ""} {pdb true} {verbose true} } { + tryCopyBuildFile $fileName $managedOnly $platform "" $verbose if {$pdb} then { tryCopyBuildFile [appendArgs \ - [file rootname $fileName] .pdb] $platform "" $verbose + [file rootname $fileName] .pdb] $managedOnly $platform "" $verbose } } proc tryDeleteAssembly { fileName {platform ""} {pdb true} {verbose true} } { @@ -3714,10 +3720,22 @@ } } } } } + + proc copySampleDatabaseFiles {} { + uplevel 1 { + # + # NOTE: Copy (or re-copy) the reference database file used for this + # unit test to the build directory in case it has been changed + # by a previous test run. + # + file copy -force $northwindEfDbFile \ + [file join [getBuildDirectory true] [file tail $northwindEfDbFile]] + } + } proc runSQLiteTestPrologue {} { # # NOTE: Skip running our custom prologue if the main one has been # skipped. @@ -3788,18 +3806,25 @@ eval lappend nativeFileNames [getInteropAssemblyFileNamesOnly] # # NOTE: Build the list of mixed-mode assembly files that we handle. # - set mixedFileNames [list System.Data.SQLite.dll] + set mixedFileNames [list] + + if {[hasRuntimeOption native]} then { + lappend mixedFileNames System.Data.SQLite.dll + } # # NOTE: Build the list of managed assembly files that we handle. # set managedFileNames [list \ - System.Data.SQLite.dll System.Data.SQLite.Linq.dll \ - System.Data.SQLite.EF6.dll] + System.Data.SQLite.Linq.dll System.Data.SQLite.EF6.dll] + + if {![hasRuntimeOption native]} then { + lappend managedFileNames System.Data.SQLite.dll + } # # NOTE: Show the various lists of file names that are handled by this # procedure. # @@ -3869,20 +3894,20 @@ } } if {![info exists ::no(deleteSqliteExternalFiles)]} then { foreach fileName $mdaConfigFileNames { - tryDeleteBuildFile $fileName + tryDeleteBuildFile $fileName false } foreach fileName $externalFileNames { tryDeleteBinaryFile $fileName } } if {![info exists ::no(deleteSqliteNativeFiles)]} then { - if {![info exists ::no(deleteSqliteImplicitFiles)]} then { + if {![info exists ::no(deleteSqliteImplicitNativeFiles)]} then { foreach fileName $nativeFileNames { tryDeleteAssembly $fileName } } @@ -3902,10 +3927,22 @@ } } } if {![info exists ::no(deleteSqliteMixedFiles)]} then { + # + # NOTE: If the "native" runtime option is set, delete implicit + # mixed-mode assembly files as well. This runtime option + # check is handled when building the list of mixed-mode + # assembly file names. + # + if {![info exists ::no(deleteSqliteImplicitMixedFiles)]} then { + foreach fileName $mixedFileNames { + tryDeleteAssembly $fileName + } + } + if {![info exists ::no(deleteSqliteNonImplicitFiles)]} then { if {![info exists ::no(deleteSqlitePlatformFiles)] && \ [string length $platform] > 0} then { foreach fileName $mixedFileNames { tryDeleteAssembly $fileName $platform @@ -3948,11 +3985,11 @@ if {![info exists ::no(verifyBuildDirectory)]} then { # # NOTE: At this point, the build directory MUST exist as a # valid directory for the testing process to continue. # - set directory [getBuildDirectory] + set directory [getBuildDirectory false] if {![file exists $directory] || \ ![file isdirectory $directory]} then { # # NOTE: Just prior to actually halting the testing process, @@ -3979,11 +4016,11 @@ if {![info exists ::no(copySqliteConfigFiles)]} then { tputs $::test_channel \ "---- copying \"configuration\" files...\n" foreach fileName $configFileNames { - tryCopyBuildFile $fileName + tryCopyBuildFile $fileName false } } if {![info exists ::no(copySqliteExternalFiles)]} then { # @@ -3996,11 +4033,11 @@ # tputs $::test_channel \ "---- copying \"MDA configuration\" files...\n" foreach fileName $mdaConfigFileNames { - tryCopyBinaryFile EagleShell.exe.mda.config "" $fileName + tryCopyBinaryFile EagleShell.exe.mda.config true "" $fileName } # # NOTE: Copy the external binaries, if any, to the directory that # contains the Eagle shell. This is typically used to make @@ -4018,17 +4055,17 @@ # # NOTE: If the test platform is likely the default for this # machine, also try to copy the native files to the # binary location. # - if {![info exists ::no(copySqliteImplicitFiles)] && \ + if {![info exists ::no(copySqliteImplicitNativeFiles)] && \ [isDefaultBuildPlatform]} then { tputs $::test_channel \ "---- copying implicit \"native\" files...\n" foreach fileName $nativeFileNames { - tryCopyAssembly $fileName + tryCopyAssembly $fileName false } } if {![info exists ::no(copySqliteNonImplicitFiles)]} then { if {![info exists ::no(copySqlitePlatformFiles)] && \ @@ -4036,11 +4073,11 @@ tputs $::test_channel [appendArgs \ "---- copying \"native\" files for platform \"" \ $platform \"...\n] foreach fileName $nativeFileNames { - tryCopyAssembly $fileName $platform + tryCopyAssembly $fileName false $platform } } if {![info exists ::no(copySqliteArchitectureFiles)] && \ [string length $architecture] > 0} then { @@ -4047,26 +4084,41 @@ tputs $::test_channel [appendArgs \ "---- copying \"native\" files for architecture \"" \ $architecture \"...\n] foreach fileName $nativeFileNames { - tryCopyAssembly $fileName $architecture + tryCopyAssembly $fileName false $architecture } } } } if {![info exists ::no(copySqliteMixedFiles)]} then { + # + # NOTE: If the "native" runtime option is set, copy implicit + # mixed-mode assembly files as well. The runtime option + # check is handled when building the list of mixed-mode + # assembly file names. + # + if {![info exists ::no(copySqliteImplicitMixedFiles)]} then { + tputs $::test_channel \ + "---- copying implicit \"mixed\" files...\n" + + foreach fileName $mixedFileNames { + tryCopyAssembly $fileName false + } + } + if {![info exists ::no(copySqliteNonImplicitFiles)]} then { if {![info exists ::no(copySqlitePlatformFiles)] && \ [string length $platform] > 0} then { tputs $::test_channel [appendArgs \ "---- copying \"mixed\" files for platform \"" \ $platform \"...\n] foreach fileName $mixedFileNames { - tryCopyAssembly $fileName $platform + tryCopyAssembly $fileName false $platform } } if {![info exists ::no(copySqliteArchitectureFiles)] && \ [string length $architecture] > 0} then { @@ -4073,21 +4125,21 @@ tputs $::test_channel [appendArgs \ "---- copying \"mixed\" files for architecture \"" \ $architecture \"...\n] foreach fileName $mixedFileNames { - tryCopyAssembly $fileName $architecture + tryCopyAssembly $fileName false $architecture } } } } if {![info exists ::no(copySqliteManagedFiles)]} then { tputs $::test_channel "---- copying \"managed\" files...\n" foreach fileName $managedFileNames { - tryCopyAssembly $fileName + tryCopyAssembly $fileName true } } } # @@ -4118,96 +4170,71 @@ } } } } - foreach fileNameOnly [getNativeLibraryFileNamesOnly] { + foreach fileNameOnly $nativeFileNames { + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"" $fileNameOnly "\"... \"" \ + [file version [getBinaryFileName $fileNameOnly]] \"\n] + } + } + + foreach fileNameOnly $mixedFileNames { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $fileNameOnly "\"... \"" \ [file version [getBinaryFileName $fileNameOnly]] \"\n] } } - foreach fileNameOnly [getInteropAssemblyFileNamesOnly] { + foreach fileNameOnly $managedFileNames { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $fileNameOnly "\"... \"" \ [file version [getBinaryFileName $fileNameOnly]] \"\n] } } - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"System.Data.SQLite.dll\"... \"" \ - [file version [getBinaryFileName System.Data.SQLite.dll]] \"\n] - } - - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"System.Data.SQLite.Linq.dll\"... \"" \ - [file version [getBinaryFileName System.Data.SQLite.Linq.dll]] \ - \"\n] - } - - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"System.Data.SQLite.EF6.dll\"... \"" \ - [file version [getBinaryFileName System.Data.SQLite.EF6.dll]] \ - \"\n] - } - if {[string length $platform] > 0} then { - foreach fileNameOnly [getNativeLibraryFileNamesOnly] { + foreach fileNameOnly $nativeFileNames { + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"" $platform \ + / $fileNameOnly "\"... \"" [file version \ + [getBinaryFileName $fileNameOnly $platform]] \"\n] + } + } + + foreach fileNameOnly $mixedFileNames { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $platform \ / $fileNameOnly "\"... \"" [file version \ [getBinaryFileName $fileNameOnly $platform]] \"\n] } } - - foreach fileNameOnly [getInteropAssemblyFileNamesOnly] { - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"" $platform \ - / $fileNameOnly "\"... \"" [file version \ - [getBinaryFileName $fileNameOnly $platform]] \"\n] - } - } - - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"" $platform \ - "/System.Data.SQLite.dll\"... \"" [file version \ - [getBinaryFileName System.Data.SQLite.dll $platform]] \"\n] - } } if {[string length $architecture] > 0} then { - foreach fileNameOnly [getNativeLibraryFileNamesOnly] { + foreach fileNameOnly $nativeFileNames { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $architecture \ / $fileNameOnly "\"... \"" [file version \ [getBinaryFileName $fileNameOnly $architecture]] \"\n] } } - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"" $architecture \ - / $fileNameOnly "\"... \"" [file version \ - [getBinaryFileName $fileNameOnly $architecture]] \"\n] - } - - catch { - tputs $::test_channel [appendArgs \ - "---- file version of \"" $architecture \ - "/System.Data.SQLite.dll\"... \"" [file version \ - [getBinaryFileName System.Data.SQLite.dll $architecture]] \ - \"\n] + foreach fileNameOnly $mixedFileNames { + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"" $architecture \ + / $fileNameOnly "\"... \"" [file version \ + [getBinaryFileName $fileNameOnly $architecture]] \"\n] + } } } # # NOTE: Grab the list of managed assemblies for the current process @@ -4313,15 +4340,15 @@ INTEROP_INCLUDE_CEROD INTEROP_INCLUDE_EXTRA INTEROP_INCLUDE_SEE \ INTEROP_INCLUDE_ZIPVFS INTEROP_JSON1_EXTENSION \ INTEROP_LEGACY_CLOSE INTEROP_LOG INTEROP_PERCENTILE_EXTENSION \ INTEROP_REGEXP_EXTENSION INTEROP_TEST_EXTENSION \ INTEROP_TOTYPE_EXTENSION INTEROP_VIRTUAL_TABLE NET_20 NET_35 \ - NET_40 NET_45 NET_451 NET_452 NET_46 NET_461 NET_COMPACT_20 \ - PLATFORM_COMPACTFRAMEWORK PRELOAD_NATIVE_LIBRARY RETARGETABLE \ - SQLITE_STANDARD THROW_ON_DISPOSED TRACE TRACE_CONNECTION \ - TRACE_DETECTION TRACE_HANDLE TRACE_PRELOAD TRACE_SHARED \ - TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \ + NET_40 NET_45 NET_451 NET_452 NET_46 NET_461 NET_462 \ + NET_COMPACT_20 PLATFORM_COMPACTFRAMEWORK PRELOAD_NATIVE_LIBRARY \ + RETARGETABLE SQLITE_STANDARD THROW_ON_DISPOSED TRACE \ + TRACE_CONNECTION TRACE_DETECTION TRACE_HANDLE TRACE_PRELOAD \ + TRACE_SHARED TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \ USE_ENTITY_FRAMEWORK_6 USE_INTEROP_DLL USE_PREPARE_V2 WINDOWS] { # # NOTE: Check if the compile-time option is listed in the list of # "define constants" kept track of by the managed assembly. # @@ -4513,27 +4540,31 @@ # # NOTE: Setup the variables that refer to the various non-data files # required by the tests in this file. # set entityFrameworkDllFile \ - [getBuildFileName EntityFramework.dll] + [getBuildFileName EntityFramework.dll true] + + set installerExeFile \ + [getBuildFileName Installer.exe true] - set installerExeFile [getBuildFileName Installer.exe] - set sqliteDesignerDllFile [getBuildFileName SQLite.Designer.dll] + set sqliteDesignerDllFile \ + [getBuildFileName SQLite.Designer.dll true] set systemDataSQLiteDllFile \ - [getBuildFileName System.Data.SQLite.dll] + [getBuildFileName System.Data.SQLite.dll \ + [expr {![hasRuntimeOption native]}]] set systemDataSQLiteLinqDllFile \ - [getBuildFileName System.Data.SQLite.Linq.dll] + [getBuildFileName System.Data.SQLite.Linq.dll true] set systemDataSQLiteEf6DllFile \ - [getBuildFileName System.Data.SQLite.EF6.dll] + [getBuildFileName System.Data.SQLite.EF6.dll true] - set testExeFile [getBuildFileName test.exe] - set testLinqExeFile [getBuildFileName testlinq.exe] - set testEf6ExeFile [getBuildFileName testef6.exe] + set testExeFile [getBuildFileName test.exe true] + set testLinqExeFile [getBuildFileName testlinq.exe true] + set testEf6ExeFile [getBuildFileName testef6.exe true] # # NOTE: Setup the variables that refer to the various data files # required by the tests in this file. #