Skip to content
Open
Show file tree
Hide file tree
Changes from all 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 .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dnceng.secretmanager": {
"version": "1.1.0-beta.25564.1",
"version": "1.1.0-beta.25608.3",
"commands": [
"secret-manager"
]
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<PackageVersion Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" />
<PackageVersion Include="Mono.Options" Version="5.3.0.1" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Octokit" Version="13.0.1" />
<PackageVersion Include="Polly.Core" Version="8.4.1" />
<PackageVersion Include="sn" Version="1.0.0" />
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ This file should be imported by eng/Versions.props
<!-- dotnet/templating dependencies -->
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.4.25220.1</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25570.6</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25570.6</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26056.1</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26056.1</MicrosoftDotNetHelixSdkPackageVersion>
<!-- dotnet/arcade-services dependencies -->
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25564.1</MicrosoftDotNetDarcLibPackageVersion>
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25564.1</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25619.4</MicrosoftDotNetDarcLibPackageVersion>
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25619.4</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
<!-- dotnet/xharness dependencies -->
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.25578.2</MicrosoftDotNetXHarnessCLIPackageVersion>
<!-- dotnet/symreader-converter dependencies -->
Expand Down Expand Up @@ -54,7 +54,7 @@ This file should be imported by eng/Versions.props
<!-- dotnet/command-line-api dependencies -->
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
<!-- dotnet/dnceng dependencies -->
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25564.1</MicrosoftDncEngSecretManagerPackageVersion>
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25608.3</MicrosoftDncEngSecretManagerPackageVersion>
<!-- dotnet/msbuild dependencies -->
<MicrosoftBuildPackageVersion>17.12.50</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>17.12.50</MicrosoftBuildFrameworkPackageVersion>
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>43b5827697e501c442eb75ffff832cd4df2514fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25570.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26056.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1926cf647dd684194c2914f47f61ff534f030ac</Sha>
<Sha>e43d0e93ea2e7b1b3107abb67684db8ee76b2589</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25570.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26056.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1926cf647dd684194c2914f47f61ff534f030ac</Sha>
<Sha>e43d0e93ea2e7b1b3107abb67684db8ee76b2589</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25564.1">
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25619.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>526aa00e2a2533e0263e50f299d5525572c48c18</Sha>
<Sha>db9ea03a5ea7330d52ca996e08d50ba2f3d09ad9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25564.1">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25619.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>526aa00e2a2533e0263e50f299d5525572c48c18</Sha>
<Sha>db9ea03a5ea7330d52ca996e08d50ba2f3d09ad9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.25578.2">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down Expand Up @@ -158,9 +158,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25564.1">
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25608.3">
<Uri>https://github.com/dotnet/dnceng</Uri>
<Sha>79d5ba9594a98c05483843e8bc018e312bc5817b</Sha>
<Sha>6b49135c494c814a01232e423244f14241cf09b4</Sha>
</Dependency>
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
<Dependency Name="Microsoft.Build" Version="17.12.50">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters:
type: boolean

steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ steps:
workingDirectory: $(Agent.TempDirectory)

- script: |
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: "Source Index: Download netsourceindex Tools"
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
Expand Down
4 changes: 2 additions & 2 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="13.4-RELEASE"
__FreeBSDBase="13.5-RELEASE"
__FreeBSDPkg="1.21.3"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
Expand Down Expand Up @@ -383,7 +383,7 @@ while :; do
;;
freebsd14)
__CodeName=freebsd
__FreeBSDBase="14.2-RELEASE"
__FreeBSDBase="14.3-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "amzn" ]; then
Expand Down
13 changes: 10 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -556,19 +556,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
})
}

if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
$vsRequirements = $GlobalJson.tools.vs
} else {
$vsRequirements = $null
}
}

$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')

if (!$excludePrereleaseVS) {
$args += '-prerelease'
}

if (Get-Member -InputObject $vsRequirements -Name 'version') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
$args += '-version'
$args += $vsRequirements.version
}

if (Get-Member -InputObject $vsRequirements -Name 'components') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
foreach ($component in $vsRequirements.components) {
$args += '-requires'
$args += $component
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100",
"version": "11.0.100-alpha.1.25618.104",
"rollForward": "latestFeature",
"paths": [
".dotnet",
Expand All @@ -9,11 +9,11 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100"
"dotnet": "11.0.100-alpha.1.25618.104"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25570.6",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25570.6",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26056.1",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26056.1",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
Loading