Merge branch 'main' into darc-main-35b1ce53-93f3-4548-9141-a67575ca61c3
This commit is contained in:
commit
a0b301e751
7 changed files with 18 additions and 14 deletions
|
@ -1,6 +1,5 @@
|
||||||
# .NET SDK Installers
|
# .NET SDK Installers
|
||||||
|
|
||||||
[](https://gitter.im/dotnet/cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
|
||||||
[](https://GitHub.com/dotnet/installer/releases/)
|
[](https://GitHub.com/dotnet/installer/releases/)
|
||||||
[](https://github.com/dotnet/installer)
|
[](https://github.com/dotnet/installer)
|
||||||
[](https://GitHub.com/dotnet/installer/issues?q=is%3Aissue+is%3Aopened)
|
[](https://GitHub.com/dotnet/installer/issues?q=is%3Aissue+is%3Aopened)
|
||||||
|
|
|
@ -76,7 +76,10 @@
|
||||||
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.swr" />
|
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.swr" />
|
||||||
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
|
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
|
||||||
<SdkNonShippingAssetsToPublish Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" />
|
<SdkNonShippingAssetsToPublish Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" />
|
||||||
|
<WixPacksToPublish Include="$(ArtifactsNonShippingPackagesDir)*.wixpack.zip" />
|
||||||
<SdkNonShippingAssetsToPublish Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.zip" />
|
<SdkNonShippingAssetsToPublish Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.zip" />
|
||||||
|
<!-- Remove wixpacks if not doing post-build signing, since they are not needed -->
|
||||||
|
<SdkNonShippingAssetsToPublish Remove="@(WixPacksToPublish)" Condition="'$(PostBuildSign)' != 'true'" />
|
||||||
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.pkg" />
|
<SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.pkg" />
|
||||||
<CheckSumsToPublish Include="$(ArtifactsShippingPackagesDir)*.sha512" />
|
<CheckSumsToPublish Include="$(ArtifactsShippingPackagesDir)*.sha512" />
|
||||||
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productCommit-*.txt.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false'" />
|
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productCommit-*.txt.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false'" />
|
||||||
|
|
|
@ -181,9 +181,9 @@
|
||||||
<Sha>9e870996b8bf0b91a791edd1039bfd23bdd01af8</Sha>
|
<Sha>9e870996b8bf0b91a791edd1039bfd23bdd01af8</Sha>
|
||||||
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
|
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23305.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23312.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
||||||
<Sha>7f9ae67f86a5adc1d9bf2f22f4bf3ec05b6d7b68</Sha>
|
<Sha>50600f7fcd6e56a496233a859ed7d4d90c173b0d</Sha>
|
||||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
|
||||||
|
@ -227,9 +227,9 @@
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||||
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
|
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23312.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23314.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
<Sha>ceb1133c46abe15ee48ea799950e7a6a74417b74</Sha>
|
<Sha>f8ebadcc83f7fc8cfd5147078c87d6e583cb32f1</Sha>
|
||||||
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
|
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23252.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23252.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
|
|
|
@ -17,7 +17,7 @@ parameters:
|
||||||
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
|
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
|
||||||
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
|
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
|
||||||
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8
|
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8
|
||||||
fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36
|
fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
|
||||||
ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
|
ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
|
||||||
|
|
||||||
# Internal builds
|
# Internal builds
|
||||||
|
@ -183,14 +183,14 @@ stages:
|
||||||
|
|
||||||
- template: ../jobs/vmr-build.yml
|
- template: ../jobs/vmr-build.yml
|
||||||
parameters:
|
parameters:
|
||||||
buildName: Fedora36_Offline_MsftSdk
|
buildName: Fedora38_Offline_MsftSdk
|
||||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||||
vmrBranch: ${{ variables.VmrBranch }}
|
vmrBranch: ${{ variables.VmrBranch }}
|
||||||
architecture: x64
|
architecture: x64
|
||||||
pool:
|
pool:
|
||||||
name: ${{ variables.defaultPoolName }}
|
name: ${{ variables.defaultPoolName }}
|
||||||
demands: ${{ variables.defaultPoolDemands }}
|
demands: ${{ variables.defaultPoolDemands }}
|
||||||
container: ${{ parameters.fedora36Container }}
|
container: ${{ parameters.fedora38Container }}
|
||||||
buildFromArchive: true # ✅
|
buildFromArchive: true # ✅
|
||||||
enablePoison: true # ✅
|
enablePoison: true # ✅
|
||||||
excludeOmniSharpTests: false # 🚫
|
excludeOmniSharpTests: false # 🚫
|
||||||
|
@ -258,14 +258,14 @@ stages:
|
||||||
|
|
||||||
- template: ../jobs/vmr-build.yml
|
- template: ../jobs/vmr-build.yml
|
||||||
parameters:
|
parameters:
|
||||||
buildName: Fedora36_Offline_CurrentSourceBuiltSdk
|
buildName: Fedora38_Offline_CurrentSourceBuiltSdk
|
||||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||||
vmrBranch: ${{ variables.VmrBranch }}
|
vmrBranch: ${{ variables.VmrBranch }}
|
||||||
architecture: x64
|
architecture: x64
|
||||||
pool:
|
pool:
|
||||||
name: ${{ variables.defaultPoolName }}
|
name: ${{ variables.defaultPoolName }}
|
||||||
demands: ${{ variables.defaultPoolDemands }}
|
demands: ${{ variables.defaultPoolDemands }}
|
||||||
container: ${{ parameters.fedora36Container }}
|
container: ${{ parameters.fedora38Container }}
|
||||||
buildFromArchive: false # 🚫
|
buildFromArchive: false # 🚫
|
||||||
enablePoison: false # 🚫
|
enablePoison: false # 🚫
|
||||||
excludeOmniSharpTests: false # 🚫
|
excludeOmniSharpTests: false # 🚫
|
||||||
|
@ -273,4 +273,4 @@ stages:
|
||||||
runOnline: false # 🚫
|
runOnline: false # 🚫
|
||||||
useMonoRuntime: false # 🚫
|
useMonoRuntime: false # 🚫
|
||||||
withPreviousSDK: false # 🚫
|
withPreviousSDK: false # 🚫
|
||||||
reuseBuildArtifactsFrom: Fedora36_Offline_MsftSdk
|
reuseBuildArtifactsFrom: Fedora38_Offline_MsftSdk
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
These URLs can't be composed from their base URL and version as we read them from the
|
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.
|
prep.sh and pipeline scripts, outside of MSBuild.
|
||||||
-->
|
-->
|
||||||
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.4.23260.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
|
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.5.23303.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
|
||||||
<PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-33.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
|
<PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-33.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
|
||||||
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.4.23260.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
|
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.5.23303.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "8.0.100-preview.4.23260.5"
|
"dotnet": "8.0.100-preview.5.23303.2"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
||||||
|
|
|
@ -309,6 +309,8 @@
|
||||||
tvossimulator-x64;
|
tvossimulator-x64;
|
||||||
maccatalyst-arm64;
|
maccatalyst-arm64;
|
||||||
maccatalyst-x64;
|
maccatalyst-x64;
|
||||||
|
linux-bionic-arm64;
|
||||||
|
linux-bionic-x64;
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue