Remove ComputeDeltaFileOutputNames use nuget version

The Microsoft.DotNet.HotReload.Utils.Generator.BuildTool nuget now includes a task to compute the output names. So the targets in the nuget are entirely self-contained now - incremental builds and project references should work now. Bump to version 1.0.1 of Generator.BuildTool which has the necessary targets
dotnet · May 10, 2021 · b5b2b81 · b5b2b81
1 parent 003b3dc
commit b5b2b81
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 164 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -210,9 +210,9 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>e51b2a920817aec200d7306b95f616f9451d47a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.0-alpha.0.21254.2">
+    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21257.1">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
-      <Sha>a95367acb2c35885f79cc32cd35c5e7b8d53c574</Sha>
+      <Sha>078f7f63b604e97c64cf907e9932a85f8aeb5dc3</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -149,7 +149,7 @@
     <MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21255.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21255.1</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.0-alpha.0.21254.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
+    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21257.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
     <CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>

diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/Directory.Build.props b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/Directory.Build.props
@@ -1,5 +1,15 @@
 <Project>
   <Import Project="..\..\Directory.Build.props" />
 
-  <Import Project="..\GenerateHotReloadDelta.props" />
+  <ItemGroup>
+    <!-- This package from https://github.com/dotnet/hotreload-utils provides
+	 targets that read the json delta script and generates deltas based on the baseline assembly and the modified sources.
+	 
+	 Projects must define the DeltaScript property that specifies the (relative) path to the json script.
+	 Deltas will be emitted next to the output assembly.  Deltas will be copied when the current
+	 project is referenced from other other projects.
+    --> 
+    <PackageReference Include="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="$(MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion)" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/Directory.Build.targets b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/Directory.Build.targets
@@ -1,5 +1,3 @@
 <Project>
   <Import Project="..\..\..\Directory.Build.targets" />
-
-  <Import Project="..\GenerateHotReloadDelta.targets" />
 </Project>
diff --git a/...tem.Runtime.Loader/tests/GenerateHotReloadDelta.BuildTasks/ComputeDeltaFileOutputNames.cs b/...tem.Runtime.Loader/tests/GenerateHotReloadDelta.BuildTasks/ComputeDeltaFileOutputNames.cs
diff --git a/...raries/System.Runtime.Loader/tests/GenerateHotReloadDelta.BuildTasks/DeltaScriptParser.cs b/...raries/System.Runtime.Loader/tests/GenerateHotReloadDelta.BuildTasks/DeltaScriptParser.cs
diff --git a/...e.Loader/tests/GenerateHotReloadDelta.BuildTasks/GenerateHotReloadDelta.BuildTasks.csproj b/...e.Loader/tests/GenerateHotReloadDelta.BuildTasks/GenerateHotReloadDelta.BuildTasks.csproj
diff --git a/src/libraries/System.Runtime.Loader/tests/GenerateHotReloadDelta.props b/src/libraries/System.Runtime.Loader/tests/GenerateHotReloadDelta.props
diff --git a/src/libraries/System.Runtime.Loader/tests/GenerateHotReloadDelta.targets b/src/libraries/System.Runtime.Loader/tests/GenerateHotReloadDelta.targets