Skip to content

Commit c42248d

Browse files
dotnet-botjoperezr
dotnet-bot
authored and
joperezr
committed
Merging changes from internal repository
1 parent 2f7d311 commit c42248d

File tree

83 files changed

+2897
-937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2897
-937
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />
@@ -37,6 +37,7 @@
3737
<package pattern="Microsoft.DotNet.Maestro.Tasks" />
3838
<package pattern="Microsoft.DotNet.RemoteExecutor" />
3939
<package pattern="Microsoft.DotNet.SignTool" />
40+
<package pattern="Microsoft.DotNet.Tar" />
4041
<package pattern="Microsoft.DotNet.XliffTasks" />
4142
<package pattern="Microsoft.DotNet.XUnitExtensions" />
4243
<package pattern="Microsoft.Signed.Wix" />

‎eng/Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
<ProjectToBuild Include="$(RepoRoot)src\**\*.csproj" Exclude="$(RepoRoot)src\Aspire.ProjectTemplates\templates\**\*.csproj" />
88
<ProjectToBuild Include="$(RepoRoot)tests\**\*.csproj" />
99
<ProjectToBuild Include="$(RepoRoot)samples\**\*.csproj" />
10-
<ProjectToBuild Include="$(RepoRoot)src\**\*.sfxproj" />
1110
</ItemGroup>
1211
</Project>

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
8+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23451.1">
11+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23463.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
13+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23451.1">
15+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23463.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
17+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23451.1">
19+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23463.1">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
21+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23451.1">
23+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23463.1">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
25+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23451.1">
27+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23463.1">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
29+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23451.1">
31+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23463.1">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
33+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
3434
</Dependency>
3535
</ToolsetDependencies>
3636
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<PropertyGroup>
1212
<!-- Package versions defined directly in <reporoot>/Directory.Packages.props -->
1313
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23422.1</MicrosoftDotnetSdkInternalPackageVersion>
14-
<_DcpVersion>0.1.29-rc.3</_DcpVersion>
14+
<_DcpVersion>0.1.30-rc.4</_DcpVersion>
1515
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23419.3</MicrosoftNETCoreAppRefPackageVersion>
1616
<MicrosoftmacOSSdkPackageVersion>13.3.8825-net8-rc1</MicrosoftmacOSSdkPackageVersion>
17-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksPackagingVersion>
18-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksTemplatingVersion>
19-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
20-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
17+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksPackagingVersion>
18+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksTemplatingVersion>
19+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
20+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
2121
</PropertyGroup>
2222
</Project>

‎eng/dcppack/Aspire.Hosting.Orchestration.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎eng/dcppack/Aspire.Hosting.Orchestration.targets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<DcpDir Condition=" '$(DcpDir)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..', 'tools'))</DcpDir>
5+
<DcpExtensionsPath Condition=" '$(DcpExtensionsPath)' == '' ">$([MSBuild]::NormalizePath($(DcpDir), 'ext'))</DcpExtensionsPath>
6+
<DcpBinPath Condition=" '$(DcpBinPath)' == '' ">$([MSBuild]::NormalizePath($(DcpExtensionsPath), 'bin'))</DcpBinPath>
7+
<DcpCliPath Condition=" '$(DcpCliPath)' == '' ">$([MSBuild]::NormalizePath($(DcpDir), 'dcp'))</DcpCliPath>
8+
<DcpCliPath Condition=" '$(OS)' == 'Windows_NT' and !$(DcpCliPath.EndsWith('.exe')) ">$(DcpCliPath).exe</DcpCliPath>
9+
</PropertyGroup>
10+
11+
</Project>

‎eng/dcppack/Sdk.in.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
3+
<Import Project="$(MSBuildThisFileDirectory)../build/Aspire.Hosting.Orchestration.@RUNTIME@.targets" />
4+
5+
</Project>

‎eng/dcppack/Sdk.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎eng/dcppack/UnixFilePermissions.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<FileList>
2+
<File Path="tools/dcp" Permission="755"/>
3+
<File Path="tools/ext/bin/traefik" Permission="755"/>
4+
<File Path="tools/ext/dcpd" Permission="755"/>
5+
<File Path="tools/ext/dcpctrl" Permission="755"/>
6+
</FileList>

‎eng/dcppack/dcppack.csproj‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<Project>
2+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
3+
4+
<Import Project="../../src/Shared/Workload.targets" />
5+
6+
<PropertyGroup>
7+
<TargetFramework>net8.0</TargetFramework>
8+
<IsPackable>true</IsPackable>
9+
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
10+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11+
<IncludeBuildOutput>false</IncludeBuildOutput>
12+
<PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$(ArtifactsShippingPackagesDir)</PackageOutputPath>
13+
</PropertyGroup>
14+
15+
<PropertyGroup>
16+
<DcpRuntime Condition=" '$(DcpRuntime)' == '' ">win-x64</DcpRuntime>
17+
<DcpPlatform Condition=" '$(DcpPlatform)' == '' ">$([System.String]::Copy('$(DcpRuntime)').Replace('win-', 'windows-').Replace('osx-', 'darwin-').Replace('-x86', '-386').Replace('-x64', '-amd64'))</DcpPlatform>
18+
<DcpPlatformType Condition=" '$(DcpPlatformType)' == '' and $(DcpPlatform.StartsWith('windows-')) ">Windows</DcpPlatformType>
19+
<DcpPlatformType Condition=" '$(DcpPlatformType)' == '' ">Unix</DcpPlatformType>
20+
</PropertyGroup>
21+
22+
<PropertyGroup>
23+
<PackageId>Aspire.Hosting.Orchestration.$(DcpRuntime)</PackageId>
24+
<Description>.NET Aspire Orchestration Dependencies</Description>
25+
</PropertyGroup>
26+
27+
<!-- Package downloads to DCP packages as we need to repack the binaries from them -->
28+
<ItemGroup>
29+
<PackageDownload Include="Microsoft.DeveloperControlPlane.darwin-amd64" Version="[$(_DcpVersion)]" />
30+
<PackageDownload Include="Microsoft.DeveloperControlPlane.darwin-arm64" Version="[$(_DcpVersion)]" />
31+
<PackageDownload Include="Microsoft.DeveloperControlPlane.linux-amd64" Version="[$(_DcpVersion)]" />
32+
<PackageDownload Include="Microsoft.DeveloperControlPlane.linux-arm64" Version="[$(_DcpVersion)]" />
33+
<PackageDownload Include="Microsoft.DeveloperControlPlane.windows-386" Version="[$(_DcpVersion)]" />
34+
<PackageDownload Include="Microsoft.DeveloperControlPlane.windows-amd64" Version="[$(_DcpVersion)]" />
35+
<PackageDownload Include="Microsoft.DeveloperControlPlane.windows-arm64" Version="[$(_DcpVersion)]" />
36+
</ItemGroup>
37+
38+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
39+
40+
<Target Name="Build" />
41+
42+
<ItemGroup>
43+
<None Include="$(NuGetPackageRoot)Microsoft.DeveloperControlPlane.$(DcpPlatform)/$(_DcpVersion)/NOTICE" Pack="true" PackagePath="/" />
44+
<None Include="$(NuGetPackageRoot)Microsoft.DeveloperControlPlane.$(DcpPlatform)/$(_DcpVersion)/tools/**/*" Pack="true" PackagePath="tools/" />
45+
<None Include="Sdk.props" Pack="true" PackagePath="sdk/" />
46+
<None Include="Sdk.in.targets" PerformTextReplacement="True" Pack="true" PackagePath="sdk/" />
47+
<None Include="Aspire.Hosting.Orchestration.props" pack="true" PackagePath="build/$(PackageId).props" />
48+
<None Include="Aspire.Hosting.Orchestration.targets" pack="true" PackagePath="build/$(PackageId).targets" />
49+
<None Include="UnixFilePermissions.xml" Pack="true" PackagePath="data/" Condition=" '$(DcpPlatformType)' == 'Unix' " />
50+
</ItemGroup>
51+
52+
<ItemGroup>
53+
<TextReplacementValue Include="RUNTIME" NewValue="$(DcpRuntime)" />
54+
</ItemGroup>
55+
56+
</Project>

0 commit comments

Comments
 (0)