Skip to content

Commit b53e918

Browse files
wtgodbewtgodbe
committed
Resolve conflicts
2 parents 1cd8b46 + 4081060 commit b53e918

File tree

21 files changed

+386
-333
lines changed

21 files changed

+386
-333
lines changed

‎eng/Version.Details.props‎

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

‎eng/Version.Details.xml‎

Lines changed: 181 additions & 181 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"

‎eng/targets/CSharp.Common.targets‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@
9494
<_Parameter2>$(RepositoryUrl)/tree/$(SourceRevisionId)</_Parameter2>
9595
</AssemblyAttribute>
9696

97-
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
97+
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(RepoOriginalSourceRevisionId)' != ''">
98+
<_Parameter1>OriginalRepoCommitHash</_Parameter1>
99+
<_Parameter2>$(RepoOriginalSourceRevisionId)</_Parameter2>
100+
</AssemblyAttribute>
101+
102+
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
98103
<_Parameter1>Serviceable</_Parameter1>
99104
<_Parameter2>True</_Parameter2>
100105
</AssemblyAttribute>

‎eng/testing/linker/SupportFiles/Directory.Build.targets‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
<Project>
2-
3-
<PropertyGroup>
4-
<!-- Used to silence the warning caused by the workaround for https://github.com/dotnet/runtime/issues/81382 -->
5-
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
6-
</PropertyGroup>
7-
8-
<!-- needed to reference a specific version of NetCoreApp. Workaround https://github.com/dotnet/runtime/issues/81382 -->
92
<ItemGroup>
103
<FrameworkReference Update="Microsoft.NETCore.App"
114
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)" />
125

13-
<PackageReference Include="Microsoft.DotNet.ILCompiler"
14-
Version="$(MicrosoftNETCoreAppRefVersion)" />
15-
166
<!-- Workaround when there is no vNext SDK available; copy known packs info from 9.0. -->
177
<KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
188
TargetFramework="$(TargetFramework)"
@@ -64,6 +54,13 @@
6454
<AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
6555
</KnownRuntimePack>
6656

57+
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
58+
<ILCompilerPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
59+
</KnownILCompilerPack>
60+
61+
<KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks">
62+
<ILLinkPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILLinkPackVersion>
63+
</KnownILLinkPack>
6764
</ItemGroup>
6865

6966
<!--

‎eng/tools/GenerateFiles/Directory.Build.props.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,5 @@
44
<ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
55
<TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
66
<LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
7-
8-
<!-- Temporarily hardcoded to true -->
9-
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
107
</PropertyGroup>
118
</Project>

‎eng/tools/GenerateFiles/Directory.Build.targets.in‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
5757
RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}"
5858
TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />
59-
60-
<PackageReference Include="Microsoft.DotNet.ILCompiler"
61-
Condition=" '$(PublishAot)' == 'true' "
62-
Version="${MicrosoftNETCoreAppRefVersion}" />
6359
</ItemGroup>
6460

6561
<ItemGroup>
@@ -118,6 +114,11 @@
118114
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</ILLinkPackVersion>
119115
</KnownILLinkPack>
120116

117+
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
118+
<ILCompilerPackVersion
119+
Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'">${MicrosoftNETCoreAppRefVersion}</ILCompilerPackVersion>
120+
</KnownILCompilerPack>
121+
121122
<!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
122123
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
123124
<LatestRuntimeFrameworkVersion

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.7.25322.101"
3+
"version": "10.0.100-preview.7.25380.108"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-preview.7.25322.101",
6+
"dotnet": "10.0.100-preview.7.25380.108",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -28,8 +28,8 @@
2828
},
2929
"msbuild-sdks": {
3030
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25413.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25377.103",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25413.101",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25413.101",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0",
3535
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

0 commit comments

Comments
 (0)