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

[main] Update dependencies from dotnet/arcade #6711

Merged
merged 10 commits into from
Aug 2, 2021
Merged

[main] Update dependencies from dotnet/arcade #6711

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
27cfef9
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 26, 2021
a81f429
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 26, 2021
3e806d8
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 27, 2021
0dd95e8
Remove SNKP and disable CA1416
Forgind Jul 27, 2021
1ed51c3
Merge https://github.com/dotnet/msbuild into darc-main-d484a0e6-ddaa-…
Forgind Jul 27, 2021
f43788e
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 28, 2021
b612daf
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 29, 2021
fccce76
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 30, 2021
b6e19f1
Add comment
Forgind Jul 30, 2021
fe5c14c
Merge branch 'main' into darc-main-d484a0e6-ddaa-44fe-8415-92626fffb0b0
rokonec Aug 2, 2021
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha />
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha />
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21365.11">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7b88b24068ecb4f6cf1da8395dbc2dee25a700bd</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-preview.1.107">
Expand All @@ -18,9 +18,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ea623578b108856d3416af28af61060ed3d695e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21365.11">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7b88b24068ecb4f6cf1da8395dbc2dee25a700bd</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- DotNetCliVersion MUST match the dotnet version in global.json.
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21365.11</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21376.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.2.21154.6</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNetCompilersToolsetVersion>4.0.0-3.21369.1</MicrosoftNetCompilersToolsetVersion>
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"allowPrerelease": true
},
"tools": {
"dotnet": "6.0.100-preview.4.21255.9",
"dotnet": "6.0.100-preview.6.21355.2",
rainersigwald marked this conversation as resolved.
Show resolved Hide resolved
"runtimes": {
"dotnet/x64": [
"2.1.7"
Expand All @@ -15,6 +15,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21365.11"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21376.4"
}
}