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

Update the stage 0 version and unwind a few of the upgrade changes (#17617)

Browse source
This commit is contained in:
Marc Paine 2023-10-27 08:06:01 -07:00 • committed by GitHub
parent 751bed6d08
commit eb4f50fabf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
.vsts-ci.yml
View file

@ -230,30 +230,30 @@ stages:
additionalBuildParameters: '/p:HostOSName="linux-musl"' additionalBuildParameters: '/p:HostOSName="linux-musl"'
linuxPortable: false linuxPortable: false
runTests: false runTests: false
# - template: eng/build.yml - template: eng/build.yml
# parameters: parameters:
# agentOs: Linux agentOs: Linux
# jobName: Build_Linux_Portable_Deb_Release_x64 jobName: Build_Linux_Portable_Deb_Release_x64
# container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg'
# buildConfiguration: Release buildConfiguration: Release
# buildArchitecture: x64 buildArchitecture: x64
# # Do not publish zips and tarballs. The linux-x64 binaries are # Do not publish zips and tarballs. The linux-x64 binaries are
# # already published by Build_LinuxPortable_Release_x64 # already published by Build_LinuxPortable_Release_x64
# additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
# linuxPortable: true linuxPortable: true
# runTests: false runTests: false
# - template: eng/build.yml - template: eng/build.yml
# parameters: parameters:
# agentOs: Linux agentOs: Linux
# jobName: Build_Linux_Portable_Rpm_Release_x64 jobName: Build_Linux_Portable_Rpm_Release_x64
# container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
# buildConfiguration: Release buildConfiguration: Release
# buildArchitecture: x64 buildArchitecture: x64
# # Do not publish zips and tarballs. The linux-x64 binaries are # Do not publish zips and tarballs. The linux-x64 binaries are
# # already published by Build_LinuxPortable_Release_x64 # already published by Build_LinuxPortable_Release_x64
# additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
# linuxPortable: true linuxPortable: true
# runTests: false runTests: false
- template: eng/build.yml - template: eng/build.yml
parameters: parameters:
agentOs: Linux agentOs: Linux

5
global.json
View file

@ -1,10 +1,9 @@
{ {
"tools": { "tools": {
"dotnet": "9.0.100-alpha.1.23511.2", "dotnet": "9.0.100-alpha.1.23524.3",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)", "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
"8.0.0-rc.1.23419.4"
] ]
} }
}, },

2
src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
View file

@ -9,6 +9,7 @@
<Msft80RC2RuntimeVersion>8.0.0-rc.2.23479.6</Msft80RC2RuntimeVersion> <Msft80RC2RuntimeVersion>8.0.0-rc.2.23479.6</Msft80RC2RuntimeVersion>
<MicrosoftNETCoreAppCrossgen2Version>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppCrossgen2Version> <MicrosoftNETCoreAppCrossgen2Version>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppCrossgen2Version>
<MicrosoftNETCoreAppHostPackageVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppHostPackageVersion> <MicrosoftNETCoreAppHostPackageVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppHostPackageVersion>
<MicrosoftNETCoreAppRefVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimeVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRuntimeVersion> <MicrosoftNETCoreAppRuntimeVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRuntimeVersion>
<MicrosoftNETILLinkTasksVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETILLinkTasksVersion> <MicrosoftNETILLinkTasksVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETILLinkTasksVersion>
<MicrosoftDotNetILCompilerVersion>$(Msft80RC2RuntimeVersion)</MicrosoftDotNetILCompilerVersion> <MicrosoftDotNetILCompilerVersion>$(Msft80RC2RuntimeVersion)</MicrosoftDotNetILCompilerVersion>
@ -19,5 +20,6 @@
<MicrosoftNETCoreILAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILAsmVersion> <MicrosoftNETCoreILAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILDAsmVersion> <MicrosoftNETCoreILDAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILDAsmVersion>
<RuntimeNativeSystemIOPortsVersion>$(Msft80RC2RuntimeVersion)</RuntimeNativeSystemIOPortsVersion> <RuntimeNativeSystemIOPortsVersion>$(Msft80RC2RuntimeVersion)</RuntimeNativeSystemIOPortsVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
View file

@ -49,6 +49,7 @@
<ExcludedPackage Include="runtime.linux-musl-arm64.runtime.native.System.IO.Ports" /> <ExcludedPackage Include="runtime.linux-musl-arm64.runtime.native.System.IO.Ports" />
<PackageDownload Include="Microsoft.NET.ILLink.Tasks" Version="[$(MicrosoftNETILLinkTasksVersion)]" /> <PackageDownload Include="Microsoft.NET.ILLink.Tasks" Version="[$(MicrosoftNETILLinkTasksVersion)]" />
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" />
</ItemGroup> </ItemGroup>
<Target Name="GetPackagesToDownload" <Target Name="GetPackagesToDownload"

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

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "9.0.100-alpha.1.23511.2" "dotnet": "9.0.100-alpha.1.23524.3"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.CentralPackageVersions": "2.0.1",

2
test/EndToEnd/ProjectBuildTests.cs
View file

@ -63,7 +63,7 @@ namespace EndToEnd.Tests
binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories); binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories);
} }
[Fact(Skip ="The current aspnet runtime is built against an 8.0 core runtime")] [Fact]
public void ItCanRunAnAppUsingTheWebSdk() public void ItCanRunAnAppUsingTheWebSdk()
{ {
var directory = TestAssets.CreateTestDirectory(); var directory = TestAssets.CreateTestDirectory();

4
test/SdkTests/SdkTests.csproj
View file

@ -64,7 +64,7 @@
<RuntimeVersionToInstall Include="5.0.0" /> <RuntimeVersionToInstall Include="5.0.0" />
<RuntimeVersionToInstall Include="6.0.0" /> <RuntimeVersionToInstall Include="6.0.0" />
<RuntimeVersionToInstall Include="7.0.0" /> <RuntimeVersionToInstall Include="7.0.0" />
<RuntimeVersionToInstall Include="8.0.0-rc.1.23419.4" /> <RuntimeVersionToInstall Include="8.0.0-rc.2.23479.6" />
</ItemGroup> </ItemGroup>
</Target> </Target>
@ -239,7 +239,7 @@
<Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)" <Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)" WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME);DOTNET_ROLL_FORWARD=LatestMajor;DOTNET_ROLL_FORWARD_TO_PRERELEASE=1"/> EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
</Target> </Target>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />