From 537d6eea652642fbf8cee2d6165f0fc0d3d2821c Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut@moderne.io>
Date: Fri, 5 Jul 2024 15:26:04 +0200
Subject: [PATCH] Only work with package references for RewriteRemote

---
 Rewrite/Directory.Build.props                              | 4 ++--
 Rewrite/src/Rewrite.CSharp.Test/Rewrite.CSharp.Test.csproj | 4 ++--
 Rewrite/src/Rewrite.Java/Rewrite.Java.csproj               | 6 +-----
 Rewrite/src/Rewrite.Json/Rewrite.Json.csproj               | 6 +-----
 Rewrite/src/Rewrite.Properties/Rewrite.Properties.csproj   | 6 +-----
 Rewrite/src/Rewrite.Test/Rewrite.Test.csproj               | 6 +-----
 Rewrite/src/Rewrite.Xml/Rewrite.Xml.csproj                 | 6 +-----
 Rewrite/src/Rewrite.Yaml/Rewrite.Yaml.csproj               | 6 +-----
 8 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/Rewrite/Directory.Build.props b/Rewrite/Directory.Build.props
index c4b10a7..e4fe473 100644
--- a/Rewrite/Directory.Build.props
+++ b/Rewrite/Directory.Build.props
@@ -3,8 +3,8 @@
         <Company>Moderne Inc.</Company>
         <PackageIcon>openrewrite.png</PackageIcon>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-        <Version>0.8.0-preview-2</Version>
+        <Version>0.8.0-preview-3</Version>
 
-        <RewriteRemoteVersion>0.8.0-preview-2</RewriteRemoteVersion>
+        <RewriteRemoteVersion>$(Version)</RewriteRemoteVersion>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Rewrite/src/Rewrite.CSharp.Test/Rewrite.CSharp.Test.csproj b/Rewrite/src/Rewrite.CSharp.Test/Rewrite.CSharp.Test.csproj
index 9ce3ee2..1fa7927 100644
--- a/Rewrite/src/Rewrite.CSharp.Test/Rewrite.CSharp.Test.csproj
+++ b/Rewrite/src/Rewrite.CSharp.Test/Rewrite.CSharp.Test.csproj
@@ -18,8 +18,8 @@
       <ProjectReference Include="..\Rewrite.Test\Rewrite.Test.csproj" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote\Rewrite.Remote.csproj" />
+    <ItemGroup>
+        <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>
 
     <Target Name="CopyCustomDirectory" BeforeTargets="CoreCompile">
diff --git a/Rewrite/src/Rewrite.Java/Rewrite.Java.csproj b/Rewrite/src/Rewrite.Java/Rewrite.Java.csproj
index 414cb6b..2aab469 100644
--- a/Rewrite/src/Rewrite.Java/Rewrite.Java.csproj
+++ b/Rewrite/src/Rewrite.Java/Rewrite.Java.csproj
@@ -20,11 +20,7 @@
       <ProjectReference Include="..\Rewrite.Core\Rewrite.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote.Api\Rewrite.Remote.Api.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release' and '$(UseProjectReference)'!='true'">
+    <ItemGroup>
         <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>
 
diff --git a/Rewrite/src/Rewrite.Json/Rewrite.Json.csproj b/Rewrite/src/Rewrite.Json/Rewrite.Json.csproj
index e719e7f..0be4127 100644
--- a/Rewrite/src/Rewrite.Json/Rewrite.Json.csproj
+++ b/Rewrite/src/Rewrite.Json/Rewrite.Json.csproj
@@ -11,11 +11,7 @@
       <ProjectReference Include="..\Rewrite.Core\Rewrite.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote.Api\Rewrite.Remote.Api.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release' and '$(UseProjectReference)'!='true'">
+    <ItemGroup>
         <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>
 
diff --git a/Rewrite/src/Rewrite.Properties/Rewrite.Properties.csproj b/Rewrite/src/Rewrite.Properties/Rewrite.Properties.csproj
index fe7676e..cfd9a3f 100644
--- a/Rewrite/src/Rewrite.Properties/Rewrite.Properties.csproj
+++ b/Rewrite/src/Rewrite.Properties/Rewrite.Properties.csproj
@@ -11,11 +11,7 @@
       <ProjectReference Include="..\Rewrite.Core\Rewrite.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote.Api\Rewrite.Remote.Api.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release' and '$(UseProjectReference)'!='true'">
+    <ItemGroup>
         <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>
 
diff --git a/Rewrite/src/Rewrite.Test/Rewrite.Test.csproj b/Rewrite/src/Rewrite.Test/Rewrite.Test.csproj
index 61c7c94..2ab2bd4 100644
--- a/Rewrite/src/Rewrite.Test/Rewrite.Test.csproj
+++ b/Rewrite/src/Rewrite.Test/Rewrite.Test.csproj
@@ -21,11 +21,7 @@
       <PackageReference Include="xunit" Version="2.8.1" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote.Api\Rewrite.Remote.Api.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release' and '$(UseProjectReference)'!='true'">
+    <ItemGroup>
         <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>
 </Project>
diff --git a/Rewrite/src/Rewrite.Xml/Rewrite.Xml.csproj b/Rewrite/src/Rewrite.Xml/Rewrite.Xml.csproj
index 9a1e172..43e5789 100644
--- a/Rewrite/src/Rewrite.Xml/Rewrite.Xml.csproj
+++ b/Rewrite/src/Rewrite.Xml/Rewrite.Xml.csproj
@@ -11,11 +11,7 @@
       <ProjectReference Include="..\Rewrite.Core\Rewrite.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote.Api\Rewrite.Remote.Api.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release' and '$(UseProjectReference)'!='true'">
+    <ItemGroup>
         <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>
 
diff --git a/Rewrite/src/Rewrite.Yaml/Rewrite.Yaml.csproj b/Rewrite/src/Rewrite.Yaml/Rewrite.Yaml.csproj
index 92a3db4..084a8bc 100644
--- a/Rewrite/src/Rewrite.Yaml/Rewrite.Yaml.csproj
+++ b/Rewrite/src/Rewrite.Yaml/Rewrite.Yaml.csproj
@@ -11,11 +11,7 @@
       <ProjectReference Include="..\Rewrite.Core\Rewrite.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)'=='Debug' and '$(IDEA_INITIAL_DIRECTORY)'!=''">
-        <ProjectReference Include="..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.Remote.Api\Rewrite.Remote.Api.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release' and '$(UseProjectReference)'!='true'">
+    <ItemGroup>
         <PackageReference Include="Rewrite.Remote.Api" Version="$(RewriteRemoteVersion)" />
     </ItemGroup>