diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6835c3b2655e..6810b40006a4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.25302.4", + "version": "1.1.0-beta.25305.3", "commands": [ "darc" ] diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 638282e1ad8b..5c795c0ddafd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -64,8 +64,8 @@ extends: template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines parameters: containers: - alpine319WithNode: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + alpine322Amd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64 centosStream9: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 debian12Amd64: @@ -215,7 +215,7 @@ extends: runTests: false ### MUSL ### - categoryName: Musl - container: alpine319WithNode + container: alpine322Amd64 runtimeIdentifier: linux-musl-x64 publishArgument: $(_publishArgument) officialBuildProperties: $(_officialBuildProperties) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 60d2d4f865f3..b59682c50b0c 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -27,8 +27,8 @@ variables: resources: containers: - - container: alpine319WithNode - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + - container: alpine322Amd64 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64 - container: centosStream9 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - container: debian12Amd64 diff --git a/CODEOWNERS b/CODEOWNERS index 38ddc0fed16d..4797df2dbc71 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -30,8 +30,8 @@ /src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf # Area-Format -/src/Cli/dotnet/commands/dotnet-format @sharwell @arunchndr -/test/dotnet-format.UnitTests @sharwell @arunchndr +/src/Cli/dotnet/commands/dotnet-format @arunchndr +/test/dotnet-format.UnitTests @arunchndr # Area-NuGet /src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebdc9b72f1bd..cb55b3c92c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -538,21 +538,21 @@ https://github.com/dotnet/dotnet ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/arcade-services - 8adf0ac5236cea59c0ad336cc818f9acaf8286ec + 3aa60dff2bcf413691d461bb5805d0b4357f4b29 - + https://github.com/dotnet/arcade-services - 8adf0ac5236cea59c0ad336cc818f9acaf8286ec + 3aa60dff2bcf413691d461bb5805d0b4357f4b29 - + https://github.com/microsoft/testfx - fe4cee5f737f70f11657780ab1bd9c0815617b29 + a4167587079e565b3f1c18b332e61f789b50acb1 - + https://github.com/microsoft/testfx - fe4cee5f737f70f11657780ab1bd9c0815617b29 + a4167587079e565b3f1c18b332e61f789b50acb1 https://github.com/dotnet/dotnet diff --git a/eng/Versions.props b/eng/Versions.props index f773028b1e21..f9c7f8a85165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ true true - 1.8.0-preview.25303.2 + 1.8.0-preview.25305.2 30 @@ -89,7 +89,7 @@ - 1.1.0-beta.25302.4 + 1.1.0-beta.25305.3 @@ -320,7 +320,7 @@ 8.0.2 8.0.0 4.18.4 - 3.10.0-preview.25303.2 + 3.10.0-preview.25305.2 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/pipelines/templates/jobs/sdk-job-matrix.yml b/eng/pipelines/templates/jobs/sdk-job-matrix.yml index 9f1aa12d0bfd..fcfac4403eac 100644 --- a/eng/pipelines/templates/jobs/sdk-job-matrix.yml +++ b/eng/pipelines/templates/jobs/sdk-job-matrix.yml @@ -52,8 +52,8 @@ parameters: osProperties: /p:OSName=linux /p:BuildSdkDeb=true runTests: true - categoryName: ContainerBased - container: alpine319WithNode - helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.18-helix-amd64 + container: alpine322Amd64 + helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.22-helix-amd64 runtimeIdentifier: linux-musl-x64 # Use HostOSName when running on alpine. osProperties: /p:HostOSName=linux-musl diff --git a/src/Layout/redist/trustedroots/timestampctl.pem b/src/Layout/redist/trustedroots/timestampctl.pem index e11dc73a8817..7bb520e98647 100644 --- a/src/Layout/redist/trustedroots/timestampctl.pem +++ b/src/Layout/redist/trustedroots/timestampctl.pem @@ -9257,6 +9257,41 @@ sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib oTM3VxKKcl+Yqg== -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +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 +7abHqTo= +-----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- MIICNjCCAb2gAwIBAgIUNdzqqPFud6Xd/BatNpw0vRVFzikwCgYIKoZIzj0EAwMw WzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYu diff --git a/test/trustedroots.Tests/GivenCodeSigningCtlFile.cs b/test/trustedroots.Tests/GivenCodeSigningCtlFile.cs index dff8520a6253..f87304984345 100644 --- a/test/trustedroots.Tests/GivenCodeSigningCtlFile.cs +++ b/test/trustedroots.Tests/GivenCodeSigningCtlFile.cs @@ -28,6 +28,7 @@ public GivenCodeSigningCtlFile() [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("552f7bdcf1a7af9e6ce672017f4f12abf77240c78e761ac203d1d9d20ac89988")] // CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL + [InlineData("5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae")] // CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US [InlineData("7353b6d6c2d6da4247773f3f07d075decb5134212bead0928ef1f46115260941")] // CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US [InlineData("7431e5f4c3c1ce4690774f0b61e05440883ba9a01ed00ba6abd7806ed3b118cf")] // CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("7b9d553e1c92cb6e8803e137f4f287d4363757f5d44b37d52f9fca22fb97df86")] // CN=GlobalSign Code Signing Root R45, O=GlobalSign nv-sa, C=BE diff --git a/test/trustedroots.Tests/GivenTimestampingCtlFile.cs b/test/trustedroots.Tests/GivenTimestampingCtlFile.cs index 715e83c84472..44c388c3db41 100644 --- a/test/trustedroots.Tests/GivenTimestampingCtlFile.cs +++ b/test/trustedroots.Tests/GivenTimestampingCtlFile.cs @@ -25,13 +25,16 @@ public GivenTimestampingCtlFile() [InlineData("43df5774b03e7fef5fe40d931a7bedf1bb2e6b42738c4e6d3841103d3aa7f339")] // CN=Entrust Root Certification Authority - G2, OU="(c) 2009 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL + [InlineData("5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae")] // CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US [InlineData("6dc47172e01cbcb0bf62580d895fe2b8ac9ad4f873801e0c10b9c837d21eb177")] // CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net [InlineData("6fff78e400a70c11011cd85977c459fb5af96a3df0540820d0f4b8607875e58f")] // CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, S=UT, C=US [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("8a866fd1b276b57e578e921c65828a2bed58e9f2f288054134b7f1f4bfc9cc74")] // CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM [InlineData("a45ede3bbbf09c8ae15c72efc07268d693a21c996fd51e67ca079460fd6d8873")] // CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM [InlineData("cbb522d7b7f127ad6a0113865bdf1cd4102e7d0759af635a7cf4720dc963c53b")] // CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3 + [InlineData("d7a7a0fb5d7e2731d771e9484ebcdef71d5f0c3e0a2948782bc83ee0ea699ef4")] // CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB [InlineData("e793c9b02fd8aa13e21c31228accb08119643b749c898964b1746d46c3d4cbd2")] // CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, S=New Jersey, C=US + [InlineData("ebd41040e4bb3ec742c9e381d31ef2a41a48b6685c96e7cef3c1df6cd4331c99")] // CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE public void File_contains_certificates_used_in_NuGet_org_package_signatures(string expectedFingerprint) { VerifyCertificateExists(s_fingerprints, expectedFingerprint);