Merge pull request #59 from CodingWonders/dt_pre_new_dismapi

Update DISM API to version 3.0
CodingWonders · Nov 4, 2023 · 279dcb4 · 279dcb4
2 parents 7aac0a7 + 18846f6
commit 279dcb4
Show file tree

Hide file tree

Showing 11 changed files with 208 additions and 218 deletions.
diff --git a/DISMTools.vbproj b/DISMTools.vbproj
@@ -76,7 +76,7 @@
       <HintPath>packages\DarkUI.2.0.2\lib\DarkUI.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dism, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5bba90053b345501, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Dism.2.5.2\lib\net40\Microsoft.Dism.dll</HintPath>
+      <HintPath>packages\Microsoft.Dism.3.0.0\lib\net40\Microsoft.Dism.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, PublicKeyToken=d42c48f11a620156, processorArchitecture=MSIL">
       <HintPath>packages\jacobslusser.ScintillaNET.Signed.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
@@ -935,7 +935,9 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="settings.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/Installer/Output/dt_setup.exe b/Installer/Output/dt_setup.exe
diff --git a/packages.config b/packages.config
@@ -4,5 +4,5 @@
   <package id="DockPanelSuite" version="3.1.0" targetFramework="net48" />
   <package id="DockPanelSuite.ThemeVS2012" version="3.1.0" targetFramework="net48" />
   <package id="jacobslusser.ScintillaNET.Signed" version="3.6.3" targetFramework="net48" />
-  <package id="Microsoft.Dism" version="2.5.2" targetFramework="net48" />
+  <package id="Microsoft.Dism" version="3.0.0" targetFramework="net48" />
 </packages>
diff --git a/pkgsrc/Microsoft.Dism.2.5.2/.signature.p7s b/pkgsrc/Microsoft.Dism.2.5.2/.signature.p7s
diff --git a/pkgsrc/Microsoft.Dism.2.5.2/lib/net40/Microsoft.Dism.dll b/pkgsrc/Microsoft.Dism.2.5.2/lib/net40/Microsoft.Dism.dll
diff --git a/pkgsrc/Microsoft.Dism.2.5.2/lib/netstandard2.0/Microsoft.Dism.dll b/pkgsrc/Microsoft.Dism.2.5.2/lib/netstandard2.0/Microsoft.Dism.dll
diff --git a/pkgsrc/Microsoft.Dism.3.0.0/.signature.p7s b/pkgsrc/Microsoft.Dism.3.0.0/.signature.p7s
diff --git a/pkgsrc/Microsoft.Dism.3.0.0/lib/net40/Microsoft.Dism.dll b/pkgsrc/Microsoft.Dism.3.0.0/lib/net40/Microsoft.Dism.dll
diff --git a/...5.2/lib/netstandard2.0/Microsoft.Dism.xml → ...t.Dism.3.0.0/lib/net40/Microsoft.Dism.xml b/...5.2/lib/netstandard2.0/Microsoft.Dism.xml → ...t.Dism.3.0.0/lib/net40/Microsoft.Dism.xml
diff --git a/pkgsrc/Microsoft.Dism.3.0.0/lib/netstandard2.0/Microsoft.Dism.dll b/pkgsrc/Microsoft.Dism.3.0.0/lib/netstandard2.0/Microsoft.Dism.dll
diff --git a/...t.Dism.2.5.2/lib/net40/Microsoft.Dism.xml → ...0.0/lib/netstandard2.0/Microsoft.Dism.xml b/...t.Dism.2.5.2/lib/net40/Microsoft.Dism.xml → ...0.0/lib/netstandard2.0/Microsoft.Dism.xml