Fix: The publishing process would be failed when the "Generate Single…

… File" option was enabled.
jsakamoto · Nov 3, 2021 · 4eb6399 · 4eb6399
1 parent c939c21
commit 4eb6399
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ NuGet package restoring ready, and no need to commit "geckodriver(.exe)" binary
 
 For example, at the package manager console on Visual Studio, enter the following command.
 
-    PM> Install-Package Selenium.WebDriver.GeckoDriver -Version 0.30.0
+    PM> Install-Package Selenium.WebDriver.GeckoDriver -Version 0.30.0.1
 
 ## Cross-platform building and publishing
 

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,3 +1,9 @@
+v.0.30.0.1
+- Fix: The publishing process would be failed when the "Generate Single File" option was enabled.
+
+v.0.30.0
+- Gecko Driver 0.30.0 release
+
 v.0.29.1
 - Gecko Driver 0.29.1 release
 

diff --git a/TestDrives/TestDrive.csproj b/TestDrives/TestDrive.csproj
@@ -12,6 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Selenium.WebDriver" Version="4.0.1" />
-    <PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.30.0" />
+    <PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.30.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/DefinePropertiesGeckoDriver.Win64.targets b/src/DefinePropertiesGeckoDriver.Win64.targets
@@ -26,6 +26,7 @@
       <Link>geckodriver.exe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
   </ItemGroup>
 
@@ -34,6 +35,7 @@
       <Link>geckodriver.exe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </Content>
   </ItemGroup>
 

diff --git a/src/DefinePropertiesGeckoDriver.targets b/src/DefinePropertiesGeckoDriver.targets
@@ -22,7 +22,7 @@
     <GeckoDriverTargetDir Condition=" '$(GeckoDriverTargetDir)' == '' ">$(TargetDir)</GeckoDriverTargetDir>
   </PropertyGroup>
 
-  <!-- Detect that project type is Web or Not. -->
+  <!-- Detect that the project type is Web or Not. -->
   <PropertyGroup Condition="'$(ProjectTypeIsWeb)' == ''">
     <ProjectTypeGuidsPadded Condition="'$(ProjectTypeGuidsPadded)' == ''">;$(ProjectTypeGuids);</ProjectTypeGuidsPadded>
     <!-- Reference: http://www.mztools.com/Articles/2008/MZ2008017.aspx -->
@@ -39,18 +39,22 @@
   </PropertyGroup>
 
   <!-- Setup driver file as project item if publishing driver file is enabled. -->
+
   <ItemGroup Condition="'$(PublishGeckoDriver)|$(ProjectTypeIsWeb)' == 'true|true'">
     <None Include="$(GeckoDriverSrcPath)">
       <Link>$(GeckoDriverName)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
   </ItemGroup>
+
   <ItemGroup Condition="'$(PublishGeckoDriver)|$(ProjectTypeIsWeb)' == 'true|false'">
     <Content Include="$(GeckoDriverSrcPath)">
       <Link>$(GeckoDriverName)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </Content>
   </ItemGroup>
 

diff --git a/src/Selenium.WebDriver.GeckoDriver.Win32.nuspec b/src/Selenium.WebDriver.GeckoDriver.Win32.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Selenium.WebDriver.GeckoDriver.Win32</id>
     <title>[Superseded] Selenium.WebDriver.GeckoDriver.Win32</title>
-    <version>0.30.0.0</version>
+    <version>0.30.0.1</version>
     <authors>jsakamoto</authors>
     <summary>[Superseded - This package became metadata only package] Selenium Gecko Driver (Win32) (does not make your source repository too fat.)</summary>
     <description>
@@ -28,12 +28,12 @@
     <readme>README.md</readme>
     <releaseNotes>
       <![CDATA[
-      v.0.30.0
-      - Gecko Driver 0.30.0 release
+      v.0.30.0.1
+      - Fix: The publishing process would be failed when the "Generate Single File" option was enabled.
       ]]>
     </releaseNotes>
     <dependencies>
-        <dependency id="Selenium.WebDriver.GeckoDriver" version="0.30.0" />
+        <dependency id="Selenium.WebDriver.GeckoDriver" version="0.30.1" />
     </dependencies>
   </metadata>
   <files>

diff --git a/src/Selenium.WebDriver.GeckoDriver.Win64.nuspec b/src/Selenium.WebDriver.GeckoDriver.Win64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Selenium.WebDriver.GeckoDriver.Win64</id>
-    <version>0.30.0.0</version>
+    <version>0.30.0.1</version>
     <authors>jsakamoto</authors>
     <summary>Selenium Gecko Driver (Win64) (does not make your source repository too fat.)</summary>
     <description>
@@ -21,8 +21,8 @@
     <readme>README.md</readme>
     <releaseNotes>
       <![CDATA[
-      v.0.30.0
-      - Gecko Driver 0.30.0 release
+      v.0.30.0.1
+      - Fix: The publishing process would be failed when the "Generate Single File" option was enabled.
       ]]>
     </releaseNotes>
   </metadata>

diff --git a/src/Selenium.WebDriver.GeckoDriver.Win64.targets b/src/Selenium.WebDriver.GeckoDriver.Win64.targets
@@ -39,6 +39,7 @@
         <Link>geckodriver.exe</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <Visible>False</Visible>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </None>
     </ItemGroup>
 
@@ -47,6 +48,7 @@
         <Link>geckodriver.exe</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <Visible>False</Visible>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </Content>
     </ItemGroup>
 

diff --git a/src/Selenium.WebDriver.GeckoDriver.nuspec b/src/Selenium.WebDriver.GeckoDriver.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Selenium.WebDriver.GeckoDriver</id>
     <title>Selenium.WebDriver.GeckoDriver (Win32, Win64, macOS, and Linux64)</title>
-    <version>0.30.0.0</version>
+    <version>0.30.0.1</version>
     <authors>jsakamoto</authors>
     <summary>Selenium Gecko Driver (Win32, Win64, macOS, and Linux64) (does not make your source repository too fat.)</summary>
     <description>
@@ -22,8 +22,8 @@
     <readme>README.md</readme>
     <releaseNotes>
       <![CDATA[
-      v.0.30.0
-      - Gecko Driver 0.30.0 release
+      v.0.30.0.1
+      - Fix: The publishing process would be failed when the "Generate Single File" option was enabled.
       ]]>
     </releaseNotes>
   </metadata>

diff --git a/src/Selenium.WebDriver.GeckoDriver.targets b/src/Selenium.WebDriver.GeckoDriver.targets
@@ -35,7 +35,7 @@
       <GeckoDriverTargetDir Condition=" '$(GeckoDriverTargetDir)' == '' ">$(TargetDir)</GeckoDriverTargetDir>
     </PropertyGroup>
 
-    <!-- Detect that project type is Web or Not. -->
+    <!-- Detect that the project type is Web or Not. -->
     <PropertyGroup Condition="'$(ProjectTypeIsWeb)' == ''">
       <ProjectTypeGuidsPadded Condition="'$(ProjectTypeGuidsPadded)' == ''">;$(ProjectTypeGuids);</ProjectTypeGuidsPadded>
       <!-- Reference: http://www.mztools.com/Articles/2008/MZ2008017.aspx -->
@@ -52,18 +52,22 @@
     </PropertyGroup>
 
     <!-- Setup driver file as project item if publishing driver file is enabled. -->
+
     <ItemGroup Condition="'$(PublishGeckoDriver)|$(ProjectTypeIsWeb)' == 'true|true'">
       <None Include="$(GeckoDriverSrcPath)">
         <Link>$(GeckoDriverName)</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <Visible>False</Visible>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </None>
     </ItemGroup>
+
     <ItemGroup Condition="'$(PublishGeckoDriver)|$(ProjectTypeIsWeb)' == 'true|false'">
       <Content Include="$(GeckoDriverSrcPath)">
         <Link>$(GeckoDriverName)</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <Visible>False</Visible>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </Content>
     </ItemGroup>
 

diff --git a/test/Project/project.csproj b/test/Project/project.csproj
@@ -7,6 +7,6 @@
 
   <ItemGroup>
     <PackageReference Include="Selenium.WebDriver" Version="4.0.1" />
-    <PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.30.0" />
+    <PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.30.0.1" />
   </ItemGroup>
 </Project>
diff --git a/test/ProjectAB/ProjectA/packages.config b/test/ProjectAB/ProjectA/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net472" />
-  <package id="Selenium.WebDriver.GeckoDriver" version="0.30.0" targetFramework="net472" />
+  <package id="Selenium.WebDriver.GeckoDriver" version="0.30.0.1" targetFramework="net472" />
 </packages>
diff --git a/test/ProjectAB/ProjectA/projectA.csproj b/test/ProjectAB/ProjectA/projectA.csproj
@@ -56,11 +56,11 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Selenium.WebDriver.GeckoDriver.0.30.0\build\Selenium.WebDriver.GeckoDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.GeckoDriver.0.30.0\build\Selenium.WebDriver.GeckoDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.GeckoDriver.0.30.0.1\build\Selenium.WebDriver.GeckoDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.GeckoDriver.0.30.0.1\build\Selenium.WebDriver.GeckoDriver.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.GeckoDriver.0.30.0\build\Selenium.WebDriver.GeckoDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.GeckoDriver.0.30.0\build\Selenium.WebDriver.GeckoDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.GeckoDriver.0.30.0.1\build\Selenium.WebDriver.GeckoDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.GeckoDriver.0.30.0.1\build\Selenium.WebDriver.GeckoDriver.targets'))" />
   </Target>
 </Project>