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

Eng and global.json housekeeping #1756

Merged
merged 5 commits into from
Oct 30, 2023
Merged

Eng and global.json housekeeping #1756

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
650ccef
Bump and cleanup global versions
Evangelink Oct 30, 2023
30337f9
Clean Version.Details.xml
Evangelink Oct 30, 2023
833e430
Merge branch 'main' into more-infra
Evangelink Oct 30, 2023
1c80cfb
More cleanup
Evangelink Oct 30, 2023
f15883b
Bring back VS deps
Evangelink Oct 30, 2023
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
69 changes: 1 addition & 68 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="1.1.156702">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>861806bc0dc685441cb3e8f6bd1ce5ed31e6b32b</Sha>
</Dependency>
<Dependency Name="Microsoft.SymbolUploader" Version="1.1.152002">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>165896e7efeecb70f01bd011257ead0f56d32c95</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.1-release-20221129-02">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>31e8b9580bec7c5ee5c58439fbcb4c91483a2434</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.23528.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>869869342f1ec338de96adcea6e003b61f195256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.20570.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>cac955fe259cb611f6a29d09209bd717deb69037</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21264.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2eef520188beb49e31460d0a7dbe040294428ff1</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21268.2">
<Uri>https://github.com/mono/linker</Uri>
<Sha>30f2498c2a3de1f7e236d5793f5f1aca6e5ba456</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21228-01">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.0-beta-21228-01">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
<Uri>https://github.com/dotnet/symreader-converter</Uri>
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-19575-01">
<Uri>https://github.com/dotnet/symreader-converter</Uri>
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
</Dependency>
<Dependency Name="XliffTasks" Version="1.0.0-beta.21265.1">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>f4bfde77fb60daf52d8fec738d96d1d54e37dd88</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 0 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<PropertyGroup Label="Arcade settings">
<!-- Use xliff task tool to ensure creation of resx from xlf at build. True is default value but we want to set it explicitly -->
<UsingToolXliff>true</UsingToolXliff>
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
<PropertyGroup Label="MSTest dependencies">
<!-- Test Platform, .NET Test SDK and Object Model -->
Expand All @@ -31,7 +30,4 @@
<StrongNamerVersion>0.2.5</StrongNamerVersion>
<StyleCopAnalyzersVersion>1.2.0-beta.435</StyleCopAnalyzersVersion>
</PropertyGroup>
<PropertyGroup Label="Arcade dependencies">
<MicrosoftNetCompilersToolsetVersion>4.7.0-3.23315.4</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
</Project>
3 changes: 1 addition & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"tools": {
"vs": {
"version": "17.7.0",
"version": "17.8.0",
"components": [
"Microsoft.Net.Component.4.5.2.TargetingPack",
"Microsoft.VisualStudio.Windows.Build",
Expand All @@ -22,7 +22,6 @@
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23528.2",
"MSBuild.Sdk.Extras": "3.0.44"
}
}