diff --git a/.nuget/packages.config b/.nuget/packages.config new file mode 100644 index 0000000..7eefd02 --- /dev/null +++ b/.nuget/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/DiskImager.Installer/DiskImager.Installer.vdproj b/DiskImager.Installer/DiskImager.Installer.vdproj index 71d2662..fefc81b 100644 --- a/DiskImager.Installer/DiskImager.Installer.vdproj +++ b/DiskImager.Installer/DiskImager.Installer.vdproj @@ -13,6 +13,12 @@ "SccProvider" = "8:" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_4BF8E0C0CEA1BCFDD3FAE4CBE0488579" + "OwnerKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" + "MsmSig" = "8:_UNDEFINED" + } "Entry" { "MsmKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" @@ -25,6 +31,12 @@ "OwnerKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4BF8E0C0CEA1BCFDD3FAE4CBE0488579" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -43,6 +55,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { @@ -59,6 +79,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -88,6 +116,37 @@ } "File" { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4BF8E0C0CEA1BCFDD3FAE4CBE0488579" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpZipLib, Version=0.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_4BF8E0C0CEA1BCFDD3FAE4CBE0488579" + { + "Name" = "8:SharpZipLib.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpZipLib.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_072AE4B10D3C471AA2B16D68E3691837" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } } "FileType" { @@ -694,7 +753,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8FDF365DCE9B4F70A60EF2BB1651CCBF" { - "SourcePath" = "8:..\\DiskImager\\obj\\x86\\Debug\\DiskImager.exe" + "SourcePath" = "8:..\\DiskImager\\obj\\x86\\Release\\DiskImager.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_072AE4B10D3C471AA2B16D68E3691837" diff --git a/DiskImager.sln b/DiskImager.sln index f9ef149..1083430 100644 --- a/DiskImager.sln +++ b/DiskImager.sln @@ -11,6 +11,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DiskImager.Installer", "DiskImager.Installer\DiskImager.Installer.vdproj", "{001C286E-8D1F-4B60-8E76-FF20CDE63C39}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libs", "Libs\Libs.csproj", "{1B0F140A-DFA6-4693-9C09-FCB9E0B35189}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19CD6AEC-F046-48F6-8C68-E4C460CCAE47}" + ProjectSection(SolutionItems) = preProject + .nuget\packages.config = .nuget\packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -23,6 +30,8 @@ Global {4A73C63C-2BF2-4F85-AA55-A5CA581A33B4}.Release|x86.Build.0 = Release|x86 {001C286E-8D1F-4B60-8E76-FF20CDE63C39}.Debug|x86.ActiveCfg = Debug {001C286E-8D1F-4B60-8E76-FF20CDE63C39}.Release|x86.ActiveCfg = Release + {1B0F140A-DFA6-4693-9C09-FCB9E0B35189}.Debug|x86.ActiveCfg = Debug|x86 + {1B0F140A-DFA6-4693-9C09-FCB9E0B35189}.Release|x86.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DiskImager/DiskImager.csproj b/DiskImager/DiskImager.csproj index 46c25b6..2318d65 100644 --- a/DiskImager/DiskImager.csproj +++ b/DiskImager/DiskImager.csproj @@ -1,4 +1,4 @@ - + Debug @@ -39,7 +39,13 @@ app.manifest + + Always + + + ..\Libs\SharpZipLib\SharpZipLib.dll + @@ -101,4 +107,17 @@ --> + + + + + + + + + $(ProjectDir)$(OutDir)$(TargetFileName) + + + + \ No newline at end of file diff --git a/Libs/Libs.csproj b/Libs/Libs.csproj new file mode 100644 index 0000000..16dbbcd --- /dev/null +++ b/Libs/Libs.csproj @@ -0,0 +1,47 @@ + + + + Debug + x86 + 8.0.30703 + 2.0 + {1B0F140A-DFA6-4693-9C09-FCB9E0B35189} + Exe + Properties + Libs + Libs + v4.0 + Client + 512 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + \ No newline at end of file diff --git a/Libs/SharpZipLib/SharpZipLib.dll b/Libs/SharpZipLib/SharpZipLib.dll new file mode 100644 index 0000000..535bb19 Binary files /dev/null and b/Libs/SharpZipLib/SharpZipLib.dll differ