Skip to content

Commit a99af9c

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 278626
Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 10.0.0-rc.1.25407.104 -> 10.0.0-rc.1.25409.103) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25407.104 -> 10.0.0-preview.25409.103) Microsoft.Build, Microsoft.Build.Localization (Version 17.15.0-preview-25407-104 -> 17.15.0-preview-25409-103) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-preview.1.104 -> 7.0.0-preview.1.603) Microsoft.Build.Tasks.Git, Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25407.104 -> 10.0.0-beta.25409.103) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25407.104 -> 5.0.0-2.25409.103) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25407.104 -> 2.0.0-preview.1.25409.103) Microsoft.DiaSymReader (Version 2.2.0-beta.25407.104 -> 2.2.0-beta.25409.103) Microsoft.FSharp.Compiler (Version 14.0.100-preview7.25407.104 -> 14.0.100-preview7.25409.103) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-preview-25407-104 -> 18.0.0-preview-25409-103) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rc.1.25407.104 -> 10.0.100-rc.1.25409.103) Microsoft.Web.Xdt (Version 3.2.0-preview.25407.104 -> 3.2.0-preview.25409.103) System.CommandLine (Version 2.0.0-rc.1.25407.104 -> 2.0.0-rc.1.25409.103)
1 parent 0547b6c commit a99af9c

File tree

7 files changed

+441
-412
lines changed

7 files changed

+441
-412
lines changed

NuGet.config

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<!-- Begin: Package sources from dotnet-aspire -->
77
<!-- End: Package sources from dotnet-aspire -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<add key="darc-int-dotnet-runtime-aae90fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-aae90fa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-2/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-aae90fa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-1/nuget/v3/index.json" />
129
<!-- End: Package sources from dotnet-runtime -->
1310
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1411
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -40,9 +37,6 @@
4037
<clear />
4138
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4239
<!-- Begin: Package sources from dotnet-runtime -->
43-
<add key="darc-int-dotnet-runtime-aae90fa-1" value="true" />
44-
<add key="darc-int-dotnet-runtime-aae90fa-2" value="true" />
45-
<add key="darc-int-dotnet-runtime-aae90fa" value="true" />
4640
<!-- End: Package sources from dotnet-runtime -->
4741
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4842
</disabledPackageSources>

eng/Version.Details.props

Lines changed: 129 additions & 129 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 259 additions & 259 deletions
Large diffs are not rendered by default.

eng/common/core-templates/job/onelocbuild.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool: ''
7-
7+
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

@@ -27,7 +27,7 @@ parameters:
2727
is1ESPipeline: ''
2828
jobs:
2929
- job: OneLocBuild${{ parameters.JobNameSuffix }}
30-
30+
3131
dependsOn: ${{ parameters.dependsOn }}
3232

3333
displayName: OneLocBuild${{ parameters.JobNameSuffix }}
@@ -99,22 +99,20 @@ jobs:
9999
mirrorBranch: ${{ parameters.MirrorBranch }}
100100
condition: ${{ parameters.condition }}
101101

102-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
103-
parameters:
104-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
105-
args:
106-
displayName: Publish Localization Files
107-
pathToPublish: '$(Build.ArtifactStagingDirectory)/loc'
108-
publishLocation: Container
109-
artifactName: Loc
110-
condition: ${{ parameters.condition }}
102+
# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
103+
- task: CopyFiles@2
104+
displayName: Copy LocProject.json
105+
inputs:
106+
SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
107+
Contents: 'LocProject.json'
108+
TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
109+
condition: ${{ parameters.condition }}
111110

112-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
111+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
113112
parameters:
114113
is1ESPipeline: ${{ parameters.is1ESPipeline }}
115114
args:
116-
displayName: Publish LocProject.json
117-
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
118-
publishLocation: Container
119-
artifactName: Loc
115+
targetPath: '$(Build.ArtifactStagingDirectory)/loc'
116+
artifactName: 'Loc'
117+
displayName: 'Publish Localization Files'
120118
condition: ${{ parameters.condition }}

eng/common/tools.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) {
257257

258258
function GetDotNetInstallScript([string] $dotnetRoot) {
259259
$installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
260+
$shouldDownload = $false
261+
260262
if (!(Test-Path $installScript)) {
263+
$shouldDownload = $true
264+
} else {
265+
# Check if the script is older than 30 days
266+
$fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime
267+
if ($fileAge.Days -gt 30) {
268+
Write-Host "Existing install script is too old, re-downloading..."
269+
$shouldDownload = $true
270+
}
271+
}
272+
273+
if ($shouldDownload) {
261274
Create-Directory $dotnetRoot
262275
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
263276
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"

eng/common/tools.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,29 @@ function GetDotNetInstallScript {
300300
local root=$1
301301
local install_script="$root/dotnet-install.sh"
302302
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
303+
local timestamp_file="$root/.dotnet-install.timestamp"
304+
local should_download=false
303305

304306
if [[ ! -a "$install_script" ]]; then
307+
should_download=true
308+
elif [[ -f "$timestamp_file" ]]; then
309+
# Check if the script is older than 30 days using timestamp file
310+
local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0")
311+
local current_time=$(date +%s)
312+
local age_seconds=$((current_time - download_time))
313+
314+
# 30 days = 30 * 24 * 60 * 60 = 2592000 seconds
315+
if [[ $age_seconds -gt 2592000 ]]; then
316+
echo "Existing install script is too old, re-downloading..."
317+
should_download=true
318+
fi
319+
else
320+
# No timestamp file exists, assume script is old and re-download
321+
echo "No timestamp found for existing install script, re-downloading..."
322+
should_download=true
323+
fi
324+
325+
if [[ "$should_download" == true ]]; then
305326
mkdir -p "$root"
306327

307328
echo "Downloading '$install_script_url'"
@@ -328,6 +349,9 @@ function GetDotNetInstallScript {
328349
ExitWithExitCode $exit_code
329350
}
330351
fi
352+
353+
# Create timestamp file to track download time in seconds from epoch
354+
date +%s > "$timestamp_file"
331355
fi
332356
# return value
333357
_GetDotNetInstallScript="$install_script"

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25407.104",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25407.104",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25409.103",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

0 commit comments

Comments
 (0)