From 3e2b7aa281c1937ecf0d395a4d981eddf9bbe94d Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Tue, 30 Jul 2019 10:43:41 -0700
Subject: [PATCH] Flow version into *.psd1 files

---
 .../EntityFramework.NuGet.csproj              |  15 +++++++++++++++
 .../EntityFramework.NuGet.nuspec              |   2 ++
 ....PS2.psd1 => EntityFramework6.PS2.psd1.in} |   2 +-
 ...amework6.psd1 => EntityFramework6.psd1.in} | Bin 8306 -> 8268 bytes
 4 files changed, 18 insertions(+), 1 deletion(-)
 rename src/NuGet/EntityFramework/{tools/EntityFramework6.PS2.psd1 => EntityFramework6.PS2.psd1.in} (97%)
 rename src/NuGet/EntityFramework/{tools/EntityFramework6.psd1 => EntityFramework6.psd1.in} (98%)

diff --git a/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj b/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
index 110ef02ea9..50ace3d2cc 100644
--- a/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
+++ b/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
@@ -12,6 +12,10 @@
     <NoPackageAnalysis>True</NoPackageAnalysis>
   </PropertyGroup>
 
+  <ItemGroup>
+    <GeneratedContent Include="*.in" />
+  </ItemGroup>
+
   <ItemGroup>
     <NuspecProperty Include="Configuration=$(Configuration)" />
     <NuspecProperty Include="NeutralLanguage=$(NeutralLanguage)" />
@@ -20,6 +24,7 @@
     <NuspecProperty Include="SystemComponentModelAnnotationsVersion=$(SystemComponentModelAnnotationsVersion)" />
     <NuspecProperty Include="SystemConfigurationConfigurationManagerVersion=$(SystemConfigurationConfigurationManagerVersion)" />
     <NuspecProperty Include="SystemDataSqlClientVersion=$(SystemDataSqlClientVersion)" />
+    <NuspecProperty Include="IntermediateOutputPath=$(IntermediateOutputPath)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
@@ -30,6 +35,16 @@
     <ProjectReference Include="..\..\EntityFramework.SqlServer\EntityFramework.SqlServer.csproj" />
     <ProjectReference Include="..\..\ef6\ef6.csproj" />
   </ItemGroup>
+  
+  <!-- TODO: Use dotnet/arcade#204 when available -->
+  <Target Name="GenerateContent"
+          BeforeTargets="GenerateNuspec"
+          Inputs="@(GeneratedContent)"
+          Outputs="@(GeneratedContent->'$(IntermediateOutputPath)%(FileName)'">
+    <WriteLinesToFile File="$(IntermediateOutputPath)%(FileName)"
+                      Overwrite="True"
+                      Lines="$([System.IO.File]::ReadAllText(%(GeneratedContent.Identity)).Replace('$VersionPrefix$', $(VersionPrefix)))" />
+  </Target>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
diff --git a/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec b/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
index b4fdec0065..664401710e 100644
--- a/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
+++ b/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
@@ -17,6 +17,8 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="$IntermediateOutputPath$EntityFramework6.psd1" target="tools/"/>
+    <file src="$IntermediateOutputPath$EntityFramework6.PS2.psd1" target="tools/"/>
     <file src="../../../artifacts/bin/EntityFramework/$Configuration$/net40/EntityFramework.dll" target="lib/net40/" />
     <file src="../../../artifacts/bin/EntityFramework/$Configuration$/net40/EntityFramework.xml" target="lib/net40/" />
     <file src="../../../artifacts/bin/EntityFramework/$Configuration$/net45/EntityFramework.dll" target="lib/net45/" />
diff --git a/src/NuGet/EntityFramework/tools/EntityFramework6.PS2.psd1 b/src/NuGet/EntityFramework/EntityFramework6.PS2.psd1.in
similarity index 97%
rename from src/NuGet/EntityFramework/tools/EntityFramework6.PS2.psd1
rename to src/NuGet/EntityFramework/EntityFramework6.PS2.psd1.in
index 9049a7382a..4b830ee454 100644
--- a/src/NuGet/EntityFramework/tools/EntityFramework6.PS2.psd1
+++ b/src/NuGet/EntityFramework/EntityFramework6.PS2.psd1.in
@@ -8,7 +8,7 @@
 ModuleToProcess = 'EntityFramework6.PS2.psm1'
 
 # Version number of this module.
-ModuleVersion = '6.3.0' # TODO: Use $(VersionPrefix)
+ModuleVersion = '$VersionPrefix$'
 
 # ID used to uniquely identify this module
 GUID = 'a0032654-4b7b-4934-ae70-4036796a7318'
diff --git a/src/NuGet/EntityFramework/tools/EntityFramework6.psd1 b/src/NuGet/EntityFramework/EntityFramework6.psd1.in
similarity index 98%
rename from src/NuGet/EntityFramework/tools/EntityFramework6.psd1
rename to src/NuGet/EntityFramework/EntityFramework6.psd1.in
index 7240b5e2483798229a2db84ce756a9b691d98c79..d8cda45d597f6e076a50e6cb70034e193f6a2c0f 100644
GIT binary patch
delta 22
ecmez5aK>T7Ax1`($*&ounN=9nH?uQk%K-pnc?Sdl

delta 82
zcmX@(@X2ArAx2j-20aF2AU0r7XHZ~J2I3F~e+CyIwgR$48HyQFfwT&P216K-RRrW`
ZGUPMlF$4hFsSIgAUIl~Z=7)^gasZ*n5IO(=