From 0b0487634c86b05a6a069ceb279a6851a460116c Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Sun, 4 Feb 2024 11:37:50 +1000
Subject: [PATCH] Create new chromiumembeddedframework.runtime.resources
 package

- Contains locales

Issue #93
---
 .../chromiumembeddedframework.runtime.nuspec  | 10 +-----
 ...embeddedframework.runtime.resources.nuspec | 36 +++++++++++++++++++
 ...embeddedframework.runtime.resources.props} |  0
 build.ps1                                     |  9 ++---
 4 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 NuGet/chromiumembeddedframework.runtime.resources.nuspec
 rename NuGet/{chromiumembeddedframework.runtime.props => chromiumembeddedframework.runtime.resources.props} (100%)

diff --git a/NuGet/chromiumembeddedframework.runtime.nuspec b/NuGet/chromiumembeddedframework.runtime.nuspec
index ef1fd41..8ba6455 100644
--- a/NuGet/chromiumembeddedframework.runtime.nuspec
+++ b/NuGet/chromiumembeddedframework.runtime.nuspec
@@ -19,19 +19,11 @@
     <description>Chromium Embedded Framework (CEF) Release Distribution
     NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
     <tags>chrome chromium native embedded browser CEF nativepackage</tags>
-    <copyright>Copyright © 2008-2021</copyright>
+    <copyright>Copyright © 2008-2024</copyright>
   </metadata>
   <files>
-	<!-- Architecture-specific files folder hierarchy lost (native subfolders)  -->
-    <!-- https://github.com/NuGet/Home/issues/7698#issuecomment-455368655 -->
-    <!-- We have to copy swiftshader and locales via manually -->
-    <file src="..\cef_binary_3.y.z_windows32\Resources\locales\*.pak" target="CEF\win-x86\locales"/>
-	<file src="..\cef_binary_3.y.z_windows64\Resources\locales\*.pak" target="CEF\win-x64\locales"/>
-    <file src="..\cef_binary_3.y.z_windowsarm64\Resources\locales\*.pak" target="CEF\win-arm64\locales"/>
     <file src="..\cef\LICENSE.txt" target="LICENSE.txt" />
     <file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
-	<file src="chromiumembeddedframework.runtime.props" target="build\" />
-	<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
     <file src="cef128x128.png" target="images\" />
   </files>
 </package>
diff --git a/NuGet/chromiumembeddedframework.runtime.resources.nuspec b/NuGet/chromiumembeddedframework.runtime.resources.nuspec
new file mode 100644
index 0000000..f4a3d3b
--- /dev/null
+++ b/NuGet/chromiumembeddedframework.runtime.resources.nuspec
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="5.0.0">
+    <id>chromiumembeddedframework.runtime.resources</id>
+    <version>$version$</version>
+    <authors>The Chromium Embedded Framework Authors</authors>
+    <owners>The CefSharp Authors</owners>
+    <projectUrl>https://github.com/cefsharp/cef-binary</projectUrl>
+    <icon>images\cef128x128.png</icon>
+    <license type="file">LICENSE.txt</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <!--
+    TODO: Add repository link for CEF release branch and commit
+    https://docs.microsoft.com/en-us/nuget/reference/nuspec#repository
+    -->
+    <!--
+    <repository type="git" url="https://bitbucket.org/chromiumembedded/cef.git" branch="3945" commit="7ec49fabd56beae20e6b4c825c085231140c3b36" />
+    -->
+    <description>Chromium Embedded Framework (CEF) Release Distribution
+    NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
+    <tags>chrome chromium native embedded browser CEF nativepackage</tags>
+    <copyright>Copyright © 2008-2024</copyright>
+  </metadata>
+  <files>
+	<!-- Architecture-specific files folder hierarchy lost (native subfolders)  -->
+    <!-- https://github.com/NuGet/Home/issues/7698#issuecomment-455368655 -->
+    <!-- We have to copy locales manually -->
+    <file src="..\cef_binary_3.y.z_windows32\Resources\locales\*.pak" target="CEF\win-x86\locales"/>
+	<file src="..\cef_binary_3.y.z_windows64\Resources\locales\*.pak" target="CEF\win-x64\locales"/>
+    <file src="..\cef_binary_3.y.z_windowsarm64\Resources\locales\*.pak" target="CEF\win-arm64\locales"/>
+    <file src="..\cef\LICENSE.txt" target="LICENSE.txt" />
+	<file src="chromiumembeddedframework.runtime.resources.props" target="build\" />
+	<file src="chromiumembeddedframework.runtime.resources.props" target="buildTransitive\" />
+    <file src="cef128x128.png" target="images\" />
+  </files>
+</package>
diff --git a/NuGet/chromiumembeddedframework.runtime.props b/NuGet/chromiumembeddedframework.runtime.resources.props
similarity index 100%
rename from NuGet/chromiumembeddedframework.runtime.props
rename to NuGet/chromiumembeddedframework.runtime.resources.props
diff --git a/build.ps1 b/build.ps1
index 0cfe82f..be985b6 100644
--- a/build.ps1
+++ b/build.ps1
@@ -251,13 +251,7 @@ function Msvs
 		
 	if($null -eq $VSInstallPath -or !(Test-Path $VSInstallPath))
 	{
-		$VSInstallPath = & $global:VSwherePath -version $versionSearchStr -property installationPath -products 'Microsoft.VisualStudio.Product.BuildTools'
-		Write-Diagnostic "BuildTools $($VS_OFFICIAL_VER)InstallPath: $VSInstallPath"
-
-		if($null -eq $VSInstallPath -or !(Test-Path $VSInstallPath))
-		{
-			Die "Visual Studio $VS_OFFICIAL_VER was not found"
-		}
+		Die "Visual Studio $VS_OFFICIAL_VER was not found"
 	}
 		
 	$VisualStudioVersion = "$VS_VER.0"
@@ -449,6 +443,7 @@ function Nupkg
 		
 	# Meta Package
 	. $Nuget pack nuget\chromiumembeddedframework.runtime.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;' -OutputDirectory nuget
+	. $Nuget pack nuget\chromiumembeddedframework.runtime.resources.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;' -OutputDirectory nuget
 
 	# Build sdk
 	$Filename = Resolve-Path ".\nuget\cef.sdk.props"