mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 37302: [internal/release/8.0.1xx] Merge from public

Browse source 
Merge from public release/8.0.1xx to internal/release/8.0.1xx and resolve conflicts if necessary
This commit is contained in:
Sean Reeser 2024-02-15 22:54:15 +00:00
commit 0e472b69c5
10 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -214,18 +214,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24059.4">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24113.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24059.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24113.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/Versions.props
View file

@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

2
eng/common/templates/job/publish-build-assets.yml
View file

@ -58,7 +58,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:

2
eng/common/templates/post-build/post-build.yml
View file

@ -258,7 +258,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2"
}
}

4
src/SourceBuild/content/eng/Versions.props
View file

@ -30,7 +30,7 @@
These URLs can't be composed from their base URL and version as we read them from the
prep.sh and pipeline scripts, outside of MSBuild.
-->
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.101-servicing.23601.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.101-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.102-servicing.24073.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.102-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
</PropertyGroup>
</Project>

2
src/SourceBuild/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.101"
"dotnet": "8.0.102"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",

2
test/EndToEnd/ProjectBuildTests.cs
View file

@ -202,7 +202,7 @@ namespace EndToEnd.Tests
string expectedOutput =
@"[\-\s]+
[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+
[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+
[\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+
[\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+
";