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
28 changes: 14 additions & 14 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ This file should be imported by eng/Versions.props
<runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>10.0.0-alpha.1.26505.2</runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>10.0.0-alpha.1.26505.2</runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26513.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFileCatalogPackageVersion>10.0.0-beta.26513.102</MicrosoftDotNetBuildTasksFileCatalogPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.26513.102</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26513.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26513.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26513.102</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26530.118</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFileCatalogPackageVersion>10.0.0-beta.26530.118</MicrosoftDotNetBuildTasksFileCatalogPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.26530.118</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26530.118</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26530.118</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26530.118</MicrosoftDotNetXliffTasksPackageVersion>
<!-- dotnet-emscripten dependencies -->
<MicrosoftNETCoreRuntimeWasmEmscriptenTransportPackageVersion>10.0.0-alpha.1.26505.2</MicrosoftNETCoreRuntimeWasmEmscriptenTransportPackageVersion>
<!-- dotnet-llvm-project dependencies -->
Expand Down Expand Up @@ -67,14 +67,14 @@ This file should be imported by eng/Versions.props
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>19.1.0-alpha.1.25461.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportPackageVersion>19.1.0-alpha.1.25461.1</runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportPackageVersion>
<!-- dotnet-node dependencies -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26505.3</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.26517.2</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
58 changes: 29 additions & 29 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="f128bc8c39de781e3a8b700345b49f9400c5d2f9" BarId="336410" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="51ecbbf20ee54a61e50d53be03c1fcbec3983a0a" BarId="339223" />
<ProductDependencies>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/binaryen</Uri>
Expand Down Expand Up @@ -50,37 +50,37 @@
<Uri>https://github.com/dotnet/cpython</Uri>
<Sha>cd4a0b1eb736704b1c9f599da671fa441e58baea</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26505.3">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="10.0.0-alpha.1.26517.2">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>a15aa6617703d942512a7ad93881f9337d37f621</Sha>
<Sha>01652b7fe3f5201c8e4c90fead0f03f8fb1247b5</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport" Version="19.1.0-alpha.1.25461.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -236,29 +236,29 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>2cfe42ea4a7fe364dcb197beca469af8edec0ad6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26513.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26530.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f128bc8c39de781e3a8b700345b49f9400c5d2f9</Sha>
<Sha>51ecbbf20ee54a61e50d53be03c1fcbec3983a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.FileCatalog" Version="10.0.0-beta.26513.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.FileCatalog" Version="10.0.0-beta.26530.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f128bc8c39de781e3a8b700345b49f9400c5d2f9</Sha>
<Sha>51ecbbf20ee54a61e50d53be03c1fcbec3983a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26513.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26530.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f128bc8c39de781e3a8b700345b49f9400c5d2f9</Sha>
<Sha>51ecbbf20ee54a61e50d53be03c1fcbec3983a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.26513.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.26530.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f128bc8c39de781e3a8b700345b49f9400c5d2f9</Sha>
<Sha>51ecbbf20ee54a61e50d53be03c1fcbec3983a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26513.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26530.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f128bc8c39de781e3a8b700345b49f9400c5d2f9</Sha>
<Sha>51ecbbf20ee54a61e50d53be03c1fcbec3983a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26513.102">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26530.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f128bc8c39de781e3a8b700345b49f9400c5d2f9</Sha>
<Sha>51ecbbf20ee54a61e50d53be03c1fcbec3983a0a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<MajorVersion>10</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>14</PatchVersion>
<PatchVersion>15</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
outputVariableName: 'GitHubAppInstallationToken'
condition: ${{ parameters.condition }}

- task: OneLocBuild@2
- task: OneLocBuild@3
displayName: OneLocBuild
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
})

if (!(Test-Path $packagePath)) {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild"
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1857/Operations/FR/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild"
throw
}
Unzip $packagePath $packageDir
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.112",
"version": "10.0.114",
"allowPrerelease": true,
"rollForward": "major",
"paths": [
Expand All @@ -10,11 +10,11 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.112"
"dotnet": "10.0.114"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26513.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26513.102",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26530.118",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26530.118",
"Microsoft.Build.Traversal": "3.4.0"
}
}