Skip to content

Move shared code to shared directory #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Move shared code to shared directory #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\..\src\Aspire.Hosting\Utils\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion playground/dapr/AppHost/DaprAppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\..\src\Aspire.Hosting\Utils\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion playground/eShopLite/AppHost/AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\..\src\Aspire.Hosting\Utils\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion playground/orleans/OrleansAppHost/OrleansAppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\..\src\Aspire.Hosting\Utils\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 6 additions & 3 deletions src/Aspire.Dashboard/Aspire.Dashboard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,13 @@
<Protobuf Include="..\Aspire.Hosting\Dashboard\proto\resource_service.proto" GrpcServices="Client" Access="Internal">
<Link>Protos\resource_service.proto</Link>
</Protobuf>
<Compile Include="..\Aspire.Hosting\Extensions\ChannelExtensions.cs" Link="Extensions\ChannelExtensions.cs" />
<Compile Include="..\Aspire.Hosting\Utils\IEnvironmentVariables.cs" Link="Utils\IEnvironmentVariables.cs" />
<Compile Include="..\Aspire.Hosting\Utils\KnownResourceNames.cs" Link="Utils\KnownResourceNames.cs" />
<Compile Include="$(SharedDir)ChannelExtensions.cs" Link="Extensions\ChannelExtensions.cs" />
<Compile Include="$(SharedDir)IEnvironmentVariables.cs" Link="Utils\IEnvironmentVariables.cs" />
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="Utils\KnownResourceNames.cs" />
<Compile Include="$(SharedDir)KnownFormats.cs" Link="Utils\KnownFormats.cs" />
<Compile Include="$(SharedDir)StringComparers.cs" Link="Utils\StringComparers.cs" />
<Compile Include="$(SharedDir)Model\KnownProperties.cs" Link="Dashboard\KnownProperties.cs" />
<Compile Include="$(SharedDir)Model\KnownResourceTypes.cs" Link="Dashboard\KnownResourceTypes.cs" />
</ItemGroup>

</Project>
9 changes: 6 additions & 3 deletions src/Aspire.Hosting/Aspire.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
</ItemGroup>

<ItemGroup>
<Compile Include="..\Aspire.Dashboard\Model\KnownProperties.cs" Link="Dashboard\KnownProperties.cs" />
<Compile Include="..\Aspire.Dashboard\Model\KnownResourceTypes.cs" Link="Dashboard\KnownResourceTypes.cs" />
<Compile Include="..\Aspire.Dashboard\Utils\StringComparers.cs" Link="Utils\StringComparers.cs" />
<Compile Include="$(SharedDir)Model\KnownProperties.cs" Link="Dashboard\KnownProperties.cs" />
<Compile Include="$(SharedDir)Model\KnownResourceTypes.cs" Link="Dashboard\KnownResourceTypes.cs" />
<Compile Include="$(SharedDir)ChannelExtensions.cs" Link="Extensions\ChannelExtensions.cs" />
<Compile Include="$(SharedDir)IEnvironmentVariables.cs" Link="Utils\IEnvironmentVariables.cs" />
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="Utils\KnownResourceNames.cs" />
<Compile Include="$(SharedDir)StringComparers.cs" Link="Utils\StringComparers.cs" />
<Compile Include="$(SharedDir)KnownFormats.cs" Link="Utils\KnownFormats.cs" />
<Compile Include="$(SharedDir)ValueStopwatch\*.cs" LinkBase="Utils" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Aspire.Hosting/Dashboard/DockerContainerLogSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Threading.Channels;
using Aspire.Hosting.Dcp.Process;
using Aspire.Hosting.Extensions;
using Aspire.Hosting.Utils;

namespace Aspire.Hosting.Dashboard;
Expand Down
1 change: 0 additions & 1 deletion src/Aspire.Hosting/Dashboard/FileLogSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Channels;
using Aspire.Hosting.Extensions;

namespace Aspire.Hosting.Dashboard;

Expand Down
1 change: 0 additions & 1 deletion src/Aspire.Hosting/Dashboard/ResourcePublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using System.Threading.Channels;
using Aspire.Hosting.Extensions;

namespace Aspire.Hosting.Dashboard;

Expand Down
2 changes: 1 addition & 1 deletion ...e.Hosting/Extensions/ChannelExtensions.cs → src/Shared/ChannelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;
using System.Threading.Channels;

namespace Aspire.Hosting.Extensions;
namespace Aspire;

internal static class ChannelExtensions
{
Expand Down
0 ...re.Hosting/Utils/IEnvironmentVariables.cs → src/Shared/IEnvironmentVariables.cs
View file
Open in desktop
File renamed without changes.
0 ...spire.Hosting/Utils/KnownResourceNames.cs → src/Shared/KnownResourceNames.cs
View file
Open in desktop
File renamed without changes.
0 ...Aspire.Dashboard/Model/KnownProperties.cs → src/Shared/Model/KnownProperties.cs
View file
Open in desktop
File renamed without changes.
0 ...ire.Dashboard/Model/KnownResourceTypes.cs → src/Shared/Model/KnownResourceTypes.cs
View file
Open in desktop
File renamed without changes.
0 ...Aspire.Dashboard/Utils/StringComparers.cs → src/Shared/StringComparers.cs
View file
Open in desktop
File renamed without changes.