Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/arcade, dotnet/arcade-services, dotnet/source-build-externals, dotnet/templating, dotnet/xharness #14864

Merged
merged 19 commits into from
Jun 24, 2024
Merged

[main] Update dependencies from dotnet/arcade, dotnet/arcade-services, dotnet/source-build-externals, dotnet/templating, dotnet/xharness #14864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
52a13ea
Update dependencies from https://github.com/dotnet/arcade-services bu…
dotnet-maestro[bot] Jun 19, 2024
f36f602
Update dependencies from https://github.com/dotnet/arcade-services bu…
dotnet-maestro[bot] Jun 20, 2024
215d7e5
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 21, 2024
b9503a1
Update dependencies from https://github.com/dotnet/arcade-services bu…
dotnet-maestro[bot] Jun 21, 2024
7d898eb
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Jun 21, 2024
155065c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 22, 2024
c6c627f
Update dependencies from https://github.com/dotnet/arcade-services bu…
dotnet-maestro[bot] Jun 22, 2024
9096886
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Jun 22, 2024
6087544
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 23, 2024
cec357a
Update dependencies from https://github.com/dotnet/arcade-services bu…
dotnet-maestro[bot] Jun 23, 2024
b1f1de2
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Jun 23, 2024
e8525fd
Merge remote-tracking branch 'dotnet/main' into darc-main-fa9498f2-f9…
premun Jun 24, 2024
10e3d59
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 24, 2024
379fad6
Update dependencies from https://github.com/dotnet/arcade-services bu…
dotnet-maestro[bot] Jun 24, 2024
94d8be2
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jun 24, 2024
aae597d
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Jun 24, 2024
68f638c
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Jun 24, 2024
a5b03ec
Update Directory.Packages.props
mmitche Jun 24, 2024
e8d1c5f
Update Directory.Packages.props
mmitche Jun 24, 2024
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
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<!-- external -->
<ItemGroup>
<PackageVersion Include="Azure.Core" Version="1.39.0" />
<PackageVersion Include="Azure.Identity" Version="1.11.3" />
<PackageVersion Include="Azure.Identity" Version="1.11.4" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageVersion Include="CommandLineParser" Version="2.5.0" />
<PackageVersion Include="coverlet.collector" Version="1.0.1" />
Expand All @@ -81,7 +81,7 @@
<PackageVersion Include="Microsoft.Data.OData" Version="5.8.4" />
<PackageVersion Include="Microsoft.DataServices.Client" Version="$(MicrosoftDataServicesClientVersion)" />
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="1.0.5" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.60.3" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
<PackageVersion Include="Microsoft.OpenApi" Version="1.3.2" />
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.3.2" />
<PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>d617bc8ed2787c235a57cf0dcdfd087b86ff9521</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="9.0.100-preview.6.24316.1">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="9.0.100-preview.7.24323.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5cbcd39027f739dd3ce1e5d50cfb99446a605491</Sha>
<Sha>35d4d2654e2ddf43cd0161b049248b818675a1c0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24320.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24321.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1cd79a2b483a09f58fa9f6286b589bb759d391d</Sha>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24320.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24321.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1cd79a2b483a09f58fa9f6286b589bb759d391d</Sha>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.24317.3">
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.24324.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>937147daa2585553fd1760d9c0e70c6fb3747352</Sha>
<Sha>109cc7d63caa4f2d2a3bee850695d3b6d993d754</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.24317.3">
<Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.24324.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>937147daa2585553fd1760d9c0e70c6fb3747352</Sha>
<Sha>109cc7d63caa4f2d2a3bee850695d3b6d993d754</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24312.3">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24317.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>6ce15319de72ab6d4c3b0f4c40f59300cffc5450</Sha>
<Sha>65d0584b517952962b7a79195b5d7606b52fcbfe</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down Expand Up @@ -124,9 +124,9 @@
<Sha>39aef81ec6cffa06da9964b46d4b9e3bf2fc9979</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24320.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24321.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1cd79a2b483a09f58fa9f6286b589bb759d391d</Sha>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
Expand Down Expand Up @@ -154,9 +154,9 @@
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24303.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24320.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>7db00527ef8fbbe61f67e9295beebddf187efff8</Sha>
<Sha>9a2785b8409e4ee8db848cc2fbfa19b3316a3baa</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<!-- arcade -->
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>9.0.0-beta.24223.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
<!-- arcade-services -->
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.24317.3</MicrosoftDotNetMaestroClientVersion>
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.24317.3</MicrosoftDotNetMaestroTasksVersion>
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.24324.2</MicrosoftDotNetMaestroClientVersion>
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.24324.2</MicrosoftDotNetMaestroTasksVersion>
<!-- command-line-api -->
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
<!-- corefx -->
Expand Down Expand Up @@ -80,10 +80,10 @@
<!-- symreader-converter -->
<MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbVersion>
<!-- templating -->
<MicrosoftTemplateEngineAuthoringTasksVersion>9.0.100-preview.6.24316.1</MicrosoftTemplateEngineAuthoringTasksVersion>
<MicrosoftTemplateEngineAuthoringTasksVersion>9.0.100-preview.7.24323.1</MicrosoftTemplateEngineAuthoringTasksVersion>
<!-- vstest -->
<MicrosoftNetTestSdkVersion>17.5.0</MicrosoftNetTestSdkVersion>
<!-- xharness -->
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24312.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24317.3</MicrosoftDotNetXHarnessCLIVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"dotnet": "9.0.100-preview.5.24307.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24320.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24320.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24321.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24321.4",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
Loading