Skip to content
Closed
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
3 changes: 0 additions & 3 deletions activate.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function deactivate ([switch]$init) {
}

Remove-Item env:DOTNET_ROOT -ErrorAction Ignore
Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ErrorAction Ignore
if (-not $init) {
# Remove the deactivate function
Remove-Item function:deactivate
Expand All @@ -33,8 +32,6 @@ deactivate -init
$_OLD_PATH = $env:PATH
# Tell dotnet where to find itself
$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet"
# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
$env:DOTNET_MULTILEVEL_LOOKUP = 0
# Put dotnet first on PATH
$env:PATH = "${env:DOTNET_ROOT};${env:PATH}"

Expand Down
3 changes: 0 additions & 3 deletions activate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ deactivate () {
fi

unset DOTNET_ROOT
unset DOTNET_MULTILEVEL_LOOKUP
if [ ! "${1:-}" = "init" ] ; then
# Remove the deactivate function
unset -f deactivate
Expand All @@ -42,8 +41,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
_OLD_PATH="$PATH"
# Tell dotnet where to find itself
export DOTNET_ROOT="$DIR/.dotnet"
# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
export DOTNET_MULTILEVEL_LOOKUP=0
# Put dotnet first on PATH
export PATH="$DOTNET_ROOT:$PATH"

Expand Down
36 changes: 18 additions & 18 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.3.25578.104</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.3.25578.104</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25578.104</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.3.25578.104</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-alpha.1.25619.109</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-alpha.1.25619.109</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-alpha.1.25619.109</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-alpha.1.25619.109</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-alpha.1.25619.109</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
74 changes: 37 additions & 37 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1" BarId="292651" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="5661a2c0a84a3fd32916395b254ce50e5ad7e9fe" BarId="295411" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Text.Json" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Formats.Asn1" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Runtime.Caching" Version="11.0.0-alpha.1.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25578.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25578.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25619.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
9 changes: 4 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<Import Project="Version.Details.props" />

<PropertyGroup Label="Version settings">
<VersionPrefix>10.0.2</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<VersionPrefix>11.0.0</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>

Expand All @@ -15,8 +15,7 @@
<!-- Arcade features -->
<UsingToolXliff>false</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<!-- Use the current stable builds for MSBuild and Roslyn packages, next version (non-servicing) will use the preview builds -->
<PropertyGroup Label="MSBuild and Roslyn">
<MicrosoftBuildFrameworkVersion>18.0.2</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>18.0.2</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>18.0.2</MicrosoftBuildTasksCoreVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ jobs:
templateContext: ${{ parameters.templateContext }}

variables:
- name: AllowPtrToDetectTestRunRetryFiles
value: true
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
condition: ''
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
dependsOn: ''
pool: ''
is1ESPipeline: ''
Expand Down Expand Up @@ -41,4 +41,4 @@ jobs:

- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
binLogPath: ${{ parameters.binLogPath }}
binLogPath: ${{ parameters.binLogPath }}
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ steps:
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)''
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
fi

buildConfig=Release
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/internal-feed-operations.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function SetupCredProvider {
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'

Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
Invoke-WebRequest $url -OutFile installcredprovider.ps1
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1

Write-Host 'Installing plugin...'
.\installcredprovider.ps1 -Force
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/nuget-verification.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if ($NuGetExePath) {
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
$ProgressPreference = 'SilentlyContinue'
try {
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
$ProgressPreference = 'Continue'
} catch {
$ProgressPreference = 'Continue'
Expand Down
Loading
Loading