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

Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d

Browse source
This commit is contained in:
Larry Ewing 2023-04-13 00:28:56 -05:00 committed by GitHub
commit 7891e556ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 83 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eng/Version.Details.xml
View file

@ -193,18 +193,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23211.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23211.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23211.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23212.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -218,19 +218,19 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23212.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23212.4">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>02ee87c8a232a9786b56cd2102cf318559e72210</Sha>
<Sha>9092071034fa818fef8b8fd6ae9ac32c826ef040</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23210.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23210.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>759f344923a0859f3fae83431d0ba1cc62108118</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23180.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23206.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>a0d9b0e10c67721157c066abb9210d1e3e774014</Sha>
<Sha>519d565b45c46ac452fe5a77ab63295138992e07</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23211.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-preview.1.23115.2",
"dotnet": "8.0.100-preview.3.23178.7",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.3"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23211.8"
}
}

13
src/SourceBuild/content/repo-projects/aspnetcore.proj
View file

@ -24,16 +24,9 @@
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<!-- CS0618 - Caused from deprecated IOperation.Children in
Microsoft.CodeAnalysis 4.3.0, but aspnetcore references version 4.2.0.
Requires https://github.com/dotnet/source-build/issues/2482
CA1825 - Avoid unnecessary zero-length array allocations.
Requires aspnet to upgrade roslyn version.
CS8600 - Converting null literal or possible null value to non-nullable type.
Requires https://github.com/dotnet/aspnetcore/issues/45882.
CS8604 - Possible null reference argument for parameter.
Requires https://github.com/dotnet/aspnetcore/issues/45882. -->
<RepoNoWarns>CS0618;CA1825;CS8600;CS8604</RepoNoWarns>
<!-- CA1512 - Use 'ArgumentOutOfRangeException.ThrowIfEqual'
Requires https://github.com/dotnet/aspnetcore/issues/47673 -->
<RepoNoWarns>CA1512</RepoNoWarns>
</PropertyGroup>
<ItemGroup>

54
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
View file

@ -1,58 +1,4 @@
<PrebuiltLeakReport>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/cs/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/de/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/es/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/fr/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/it/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/ja/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/ko/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/pl/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/pt-BR/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/System.Collections.Immutable.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/System.CommandLine.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/System.CommandLine.NamingConventionBinder.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/System.CommandLine.Rendering.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/tr/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/zh-Hans/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="dotnet-sourcelink.x.y.z/tools/netx.y/any/zh-Hant/System.CommandLine.resources.dll">
<Type>AssemblyAttribute</Type>
</File>
<File Path="Microsoft.DotNet.ILCompiler.x.y.z/tools/netstandard/System.Collections.Immutable.dll">
<Type>AssemblyAttribute</Type>
</File>

31
src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml
View file

@ -1,5 +1,5 @@
name: dotnet-sdk
version: 6.0.100-preview.2.21155.3
version: 6.0.408
summary: Cross-Platform .NET Core SDK
description: |
.NET Core SDK. https://dot.net/core.
@ -16,21 +16,26 @@ base: core18
parts:
dotnet-sdk:
plugin: dump
source: https://download.visualstudio.microsoft.com/download/pr/25c7e38e-0a6a-4d66-ac4e-b550a44b8a98/49128be84b903799259e7bebe8e9d969/dotnet-sdk-6.0.100-preview.2.21155.3-linux-x64.tar.gz
source-checksum: sha512/90d9b6070f7732dcf75f5a09a4f10f9b23c835a3bb144e0c3f1fa451cadd3d49c9781973b180f70a4d2798358a7c00f3c0b9b3bf35326fe4c94e470e84ac8c35
source: https://download.visualstudio.microsoft.com/download/pr/dd7d2255-c9c1-4c6f-b8ad-6e853d6bb574/c8e1b5f47bf17b317a84487491915178/dotnet-sdk-6.0.408-linux-x64.tar.gz
source-checksum: sha512/d5eed37ce6c07546aa217d6e786f3b67be2b6d97c23d5888d9ee5d5398e8a9bfc06202b14e3529245f7ec78f4036778caf69bdbe099de805fe1f566277e8440e
stage-packages:
- libicu60
- libssl1.0.0
- libcurl3
- libgssapi-krb5-2
- libstdc++6
- zlib1g
- libgcc1
- libtinfo5
- liblttng-ust0
- liburcu6
- libicu60
- libc6
- libgcc1
- libstdc++6
- libssl1.0.0
- libcurl3
- libgssapi-krb5-2
- zlib1g
- lldb
- libunwind8
- libtinfo5
- liblttng-ust0
- liburcu6
runtime-wrapper:
plugin: dump
source: .

9
src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml
View file

@ -1,5 +1,5 @@
name: dotnet-sdk
version: 7.0.100-preview.1.22110.4
version: 7.0.203
summary: Cross-Platform .NET Core SDK
description: |
.NET Core SDK. https://dot.net/core.
@ -16,8 +16,8 @@ base: core18
parts:
dotnet-sdk:
plugin: dump
source: https://download.visualstudio.microsoft.com/download/pr/1af9d3c3-a20e-400c-abe5-3d80dec7b63b/803f8dc5cf21fb28245aba71a7fdbc05/dotnet-sdk-7.0.100-preview.1.22110.4-linux-x64.tar.gz
source-checksum: sha512/54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2
source: https://download.visualstudio.microsoft.com/download/pr/ebfd0bf8-79bd-480a-9e81-0b217463738d/9adc6bf0614ce02670101e278a2d8555/dotnet-sdk-7.0.203-linux-x64.tar.gz
source-checksum: sha512/ed1ae7cd88591ec52e1515c4a25d9a832eca29e8a0889549fea35a320e6e356e3806a17289f71fc0b04c36b006ae74446c53771d976c170fcbe5977ac7db1cb6
stage-packages:
- libicu60
- libc6
@ -36,3 +36,6 @@ parts:
runtime-wrapper:
plugin: dump
source: .

41
src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml Normal file
View file

@ -0,0 +1,41 @@
name: dotnet-sdk
version: 8.0.100-preview.3.23178.7
summary: Cross-Platform .NET Core SDK
description: |
.NET Core SDK. https://dot.net/core.
grade: stable
confinement: classic
apps:
dotnet:
command: dotnet
base: core18
parts:
dotnet-sdk:
plugin: dump
source: https://download.visualstudio.microsoft.com/download/pr/103d5e2c-d5c4-4101-bb6e-b82bc73a7d93/284a5cdccbc995f39806a3ba2dc17b93/dotnet-sdk-8.0.100-preview.3.23178.7-linux-x64.tar.gz
source-checksum: sha512/3b5d72979831256b9340a01db23d3b2dca801672546eeed04385949ed5f4363d3c731f31477ec82c7200ce88502dc45e03986c8acc8f2fc611b0343af5f1c488
stage-packages:
- libicu60
- libc6
- libgcc1
- libstdc++6
- libssl1.0.0
- libcurl3
- libgssapi-krb5-2
- zlib1g
- lldb
- libunwind8
- libtinfo5
- liblttng-ust0
- liburcu6
runtime-wrapper:
plugin: dump
source: .