Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-bbafab7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-bbafab7b/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.0</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25528.106</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
Expand Down
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05" BarId="288919" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="ba86126261026d26f7c30cd3434680d3965a88cf" BarId="289152" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25528.106">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25528.106">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25531.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
15 changes: 7 additions & 8 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,22 @@ parameters:
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
microbuildUseESRP: true
# Location of the MicroBuild output folder
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
microBuildOutputFolder: '$(Build.SourcesDirectory)'

continueOnError: false

steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
workingDirectory: ${{ parameters.microBuildOutputFolder }}
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- script: |
Expand Down Expand Up @@ -65,7 +64,7 @@ steps:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
Expand All @@ -85,7 +84,7 @@ steps:
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25528.106",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25531.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0"
},
Expand Down
Loading