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

Merge branch 'release/8.0.2xx' into release/8.0.3xx

Browse source
This commit is contained in:
Jason Zhai 2024-01-16 21:52:53 -08:00
commit fb56287e2d
8 changed files with 55 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -85,22 +85,22 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>3f1acb59718cadf111a0a796681e3d3509bb3381</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.200-preview.24061.45">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.200-preview.24062.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>41185cf4240faf705904213e1a0468d8164c99a8</Sha>
<Sha>67c548395fafd42a6ac4e3a7969242f72de5f8e2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-preview.24061.45">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-preview.24062.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>41185cf4240faf705904213e1a0468d8164c99a8</Sha>
<Sha>67c548395fafd42a6ac4e3a7969242f72de5f8e2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-preview.24061.45">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-preview.24062.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>41185cf4240faf705904213e1a0468d8164c99a8</Sha>
<Sha>67c548395fafd42a6ac4e3a7969242f72de5f8e2</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-preview.24061.45">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-preview.24062.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>41185cf4240faf705904213e1a0468d8164c99a8</Sha>
<Sha>67c548395fafd42a6ac4e3a7969242f72de5f8e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>

12
eng/Versions.props
View file

@ -13,7 +13,7 @@
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Calculate prerelease label -->
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
@ -26,8 +26,8 @@
<VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50>
<VersionFeature60>25</VersionFeature60>
<VersionFeature70>14</VersionFeature70>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 27))</VersionFeature60>
<VersionFeature70>$([MSBuild]::Add($(VersionFeature), 16))</VersionFeature70>
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@ -85,9 +85,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.200-preview.24061.45</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.200-preview.24061.45</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-preview.24061.45</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.200-preview.24062.10</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.200-preview.24062.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-preview.24062.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

2
eng/pipelines/templates/jobs/sdk-diff-tests.yml
View file

@ -34,7 +34,7 @@ jobs:
echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results"
installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g")
installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g")
installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv)
if [[ -z "$installer_build" ]]; then
echo "Could not find a build of installer for commit '$installer_sha'"

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.100-rtm.23551.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
<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>
</PropertyGroup>
</Project>

2
src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
View file

@ -28,7 +28,7 @@ stages:
- script: |
set -e
sha=`./.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer`
echo "##vso[build.addbuildtag]installer-$sha"
echo "##vso[build.addbuildtag]$sha"
displayName: Tag the build
workingDirectory: $(Build.SourcesDirectory)/src/installer

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

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

32
src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml Normal file
View file

@ -0,0 +1,32 @@
trigger: none
variables:
- name: cfsNPMWarnLevel
value: none
- name: cfsNugetWarnLevel
value: none
- name: myGetWarnLevel
value: none
- name: NuGetSecurityAnalysisWarningLevel
value: none
jobs:
- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
parameters:
architecture: x64
excludeSdkContentTests: true
matrix:
Ubuntu2004-Offline:
_BootstrapPrep: true
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
_EnablePoison: false
_ExcludeOmniSharpTests: false
_RunOnline: false
_WithPreviousSDK: false
name: Build_Tarball_x64
pool:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

4
test/SdkTests/TestConfig.xml
View file

@ -257,5 +257,9 @@
Skip="true"
Issue=""
Reason="Requires props file not in installer repo"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
</SkippedTests>
</Tests>