Skip to content
Merged
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
36 changes: 18 additions & 18 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@ This file should be imported by eng/Versions.props
-->
<Project>
<PropertyGroup>
<!-- _git/vs-code-coverage dependencies -->
<MicrosoftInternalCodeCoveragePackageVersion>18.6.0-preview.26156.6</MicrosoftInternalCodeCoveragePackageVersion>
<!-- dotnet/dotnet dependencies -->
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26163.2</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet-core-setup dependencies -->
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.26157.103</MicrosoftDiagnosticsNETCoreClientPackageVersion>
<!-- dotnet/runtime dependencies -->
<!-- dotnet-runtime dependencies -->
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
<!-- dotnet/core-setup dependencies -->
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26156.2</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet/symreader-converter dependencies -->
<!-- dotnet-symreader-converter dependencies -->
<MicrosoftDiaSymReaderConverterPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterPackageVersion>
<MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>
<!-- vs-code-coverage dependencies -->
<MicrosoftInternalCodeCoveragePackageVersion>18.6.0-preview.26156.6</MicrosoftInternalCodeCoveragePackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- _git/vs-code-coverage dependencies -->
<MicrosoftInternalCodeCoverageVersion>$(MicrosoftInternalCodeCoveragePackageVersion)</MicrosoftInternalCodeCoverageVersion>
<!-- dotnet/dotnet dependencies -->
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<!-- dotnet-core-setup dependencies -->
<MicrosoftExtensionsFileSystemGlobbingVersion>$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)</MicrosoftExtensionsFileSystemGlobbingVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDiagnosticsNETCoreClientVersion>$(MicrosoftDiagnosticsNETCoreClientPackageVersion)</MicrosoftDiagnosticsNETCoreClientVersion>
<!-- dotnet/runtime dependencies -->
<!-- dotnet-runtime dependencies -->
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<!-- dotnet/core-setup dependencies -->
<MicrosoftExtensionsFileSystemGlobbingVersion>$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)</MicrosoftExtensionsFileSystemGlobbingVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<!-- dotnet/symreader-converter dependencies -->
<!-- dotnet-symreader-converter dependencies -->
<MicrosoftDiaSymReaderConverterVersion>$(MicrosoftDiaSymReaderConverterPackageVersion)</MicrosoftDiaSymReaderConverterVersion>
<MicrosoftDiaSymReaderPdb2PdbVersion>$(MicrosoftDiaSymReaderPdb2PdbPackageVersion)</MicrosoftDiaSymReaderPdb2PdbVersion>
<!-- vs-code-coverage dependencies -->
<MicrosoftInternalCodeCoverageVersion>$(MicrosoftInternalCodeCoveragePackageVersion)</MicrosoftInternalCodeCoverageVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26156.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26163.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>539e8742ff635bd8b0ae8a7b3a6a02aa60b72c8b</Sha>
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
<Uri>https://github.com/dotnet/symreader-converter</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/stages/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ extends:
- stage: Renovate
displayName: Run Renovate
jobs:
- template: /eng/common/core-templates/job/renovate.yml@self
- template: /eng/common/core-templates/job/renovate.yml
parameters:
renovateConfigPath: ${{ parameters.renovateConfigPath }}
gitHubRepo: ${{ parameters.gitHubRepo }}
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ steps:
# YAML expansion, and Windows vs. Linux/Mac uses different service connections. However,
# we can avoid including the MB install step if not enabled at all. This avoids a bunch of
# extra pipeline authorizations, since most pipelines do not sign on non-Windows.
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
parameters:
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildTaskInputs:
Expand All @@ -95,7 +95,7 @@ steps:
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))

- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
parameters:
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildTaskInputs:
Expand Down
2 changes: 2 additions & 0 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ function InstallDotNet([string] $dotnetRoot,

$dotnetVersionLabel = "'sdk v$version'"

# For performance this check is duplicated in src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs
# if you are making changes here, consider if you need to make changes there as well.
if ($runtime -ne '' -and $runtime -ne 'sdk') {
$runtimePath = $dotnetRoot
$runtimePath = $runtimePath + "\shared"
Expand Down
2 changes: 2 additions & 0 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ function InstallDotNet {
local version=$2
local runtime=$4

# For performance this check is duplicated in src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs
# if you are making changes here, consider if you need to make changes there as well.
local dotnetVersionLabel="'$runtime v$version'"
if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
runtimePath="$root"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"dotnet": "11.0.100-preview.1.26104.118"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26156.2"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26163.2"
},
"test": {
"runner": "Microsoft.Testing.Platform"
}
}
}