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
28 changes: 14 additions & 14 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ This file should be imported by eng/Versions.props
-->
<Project>
<PropertyGroup>
<!-- dotnet/runtime dependencies -->
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26164.1</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.26164.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25459.9</MicrosoftNetCompilersToolsetPackageVersion>
<!-- dotnet-runtime dependencies -->
<SystemCodeDomPackageVersion>9.0.0</SystemCodeDomPackageVersion>
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0</SystemConfigurationConfigurationManagerPackageVersion>
Expand All @@ -23,17 +28,17 @@ This file should be imported by eng/Versions.props
<SystemTextJsonPackageVersion>9.0.0</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>9.0.0</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26066.3</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.26066.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
<!-- nuget/nuget.client dependencies -->
<!-- nuget-nuget.client dependencies -->
<NuGetBuildTasksPackageVersion>7.0.0-preview.2.254</NuGetBuildTasksPackageVersion>
<!-- dotnet/roslyn dependencies -->
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25459.9</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/runtime dependencies -->
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetXUnitExtensionsVersion>$(MicrosoftDotNetXUnitExtensionsPackageVersion)</MicrosoftDotNetXUnitExtensionsVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
<!-- dotnet-runtime dependencies -->
<SystemCodeDomVersion>$(SystemCodeDomPackageVersion)</SystemCodeDomVersion>
<SystemCollectionsImmutableVersion>$(SystemCollectionsImmutablePackageVersion)</SystemCollectionsImmutableVersion>
<SystemConfigurationConfigurationManagerVersion>$(SystemConfigurationConfigurationManagerPackageVersion)</SystemConfigurationConfigurationManagerVersion>
Expand All @@ -51,12 +56,7 @@ This file should be imported by eng/Versions.props
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>$(SystemThreadingChannelsPackageVersion)</SystemThreadingChannelsVersion>
<SystemThreadingTasksDataflowVersion>$(SystemThreadingTasksDataflowPackageVersion)</SystemThreadingTasksDataflowVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetXUnitExtensionsVersion>$(MicrosoftDotNetXUnitExtensionsPackageVersion)</MicrosoftDotNetXUnitExtensionsVersion>
<!-- nuget/nuget.client dependencies -->
<!-- nuget-nuget.client dependencies -->
<NuGetBuildTasksVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksVersion>
<!-- dotnet/roslyn dependencies -->
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26066.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26164.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>af17297350d5e5357d2ab3d69369d2a58b8bc4ab</Sha>
<Sha>e365cfcb58176841c2fb80d1a40926f394776970</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="7.0.0-preview.2.254">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand All @@ -118,9 +118,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d47bb1c178652caa40b55664c06c74e35edebdf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26066.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26164.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>af17297350d5e5357d2ab3d69369d2a58b8bc4ab</Sha>
<Sha>e365cfcb58176841c2fb80d1a40926f394776970</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 @@ -3,7 +3,7 @@
<Project>
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
<PropertyGroup>
<VersionPrefix>18.0.13</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>18.0.14</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
Expand Down
8 changes: 4 additions & 4 deletions eng/common/core-templates/job/source-build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion eng/common/core-templates/steps/publish-logs.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions eng/common/templates/steps/vmr-sync.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions eng/common/templates/vmr-build-pr.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions eng/common/tools.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion eng/common/tools.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 32 additions & 6 deletions eng/common/vmr-sync.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 25 additions & 5 deletions eng/common/vmr-sync.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"errorMessage": "The .NET SDK could not be found, please run a command-line build with ./build.cmd."
},
"tools": {
"dotnet": "10.0.101",
"dotnet": "10.0.104",
"vs": {
"version": "18.0"
},
"xcopy-msbuild": "18.0.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26066.3"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26164.1"
}
}