Skip to content

Commit 92f13b8

Browse files
joperezrdotnet-bot
andauthored
Merging changes from internal repository (#2)
* Merging changes from internal repository * Set executable permissions on .sh files --------- Co-authored-by: DotNet Bot <[email protected]>
1 parent 2f7d311 commit 92f13b8

File tree

110 files changed

+2944
-944
lines changed

Some content is hidden

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

110 files changed

+2944
-944
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" />

build.sh

100644100755
File mode changed.

docs/getting-started.md

Lines changed: 45 additions & 5 deletions

dotnet.sh

100644100755
File mode changed.

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/build.sh

100644100755
File mode changed.

eng/common/SetupNugetSources.sh

100644100755
File mode changed.

eng/common/build.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)