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.

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

Merge latest Library.Template #1249

Merged
merged 22 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0a35e80
Fix typo in comment
AArnott Sep 5, 2023
32ad886
Bump MicroBuildVersion to 2.0.146
AArnott Sep 5, 2023
cf980d7
Bump dotnet-coverage to 17.8.6
AArnott Sep 8, 2023
6fd79a1
Merge branch 'main' into microbuild
AArnott Sep 8, 2023
39bdb37
Bump xunit from 2.5.0 to 2.5.1 (#219)
dependabot[bot] Sep 20, 2023
a7f083d
Bump xunit.runner.visualstudio from 2.5.0 to 2.5.1 (#220)
dependabot[bot] Sep 20, 2023
5d99f30
Bump powershell to 7.3.7
AArnott Sep 20, 2023
7726859
Fix LangVersion at 11
AArnott Sep 21, 2023
cfd54c2
Merge branch 'main' into microbuild
AArnott Sep 26, 2023
9ed3b09
Bump dotnet-coverage to 17.8.7
AArnott Sep 27, 2023
75d85ec
Revert "Bump dotnet-coverage to 17.8.7"
AArnott Oct 2, 2023
b0d89f9
Bump .NET SDK to 7.0.401
AArnott Oct 8, 2023
2214ca9
Bump xunit.runner.visualstudio from 2.5.1 to 2.5.3 (#224)
dependabot[bot] Oct 16, 2023
7df6655
Bump dotnet-coverage from 17.8.6 to 17.9.1 (#222)
dependabot[bot] Oct 16, 2023
646c179
Bump powershell from 7.3.7 to 7.3.8 (#221)
dependabot[bot] Oct 16, 2023
125983c
Bump xunit from 2.5.1 to 2.5.2 (#223)
dependabot[bot] Oct 16, 2023
ba76e61
Bump xunit from 2.5.2 to 2.5.3 (#226)
dependabot[bot] Oct 24, 2023
7ef6ca0
Bump dotnet-coverage from 17.9.1 to 17.9.3 (#225)
dependabot[bot] Oct 24, 2023
faaca53
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Oct 24, 2023
80b5e81
Merge remote-tracking branch 'libtemplate/microbuild' into libtemplat…
AArnott Oct 24, 2023
689f993
Handle new warnings
AArnott Oct 24, 2023
9965b55
Fix dependency version conflicts
AArnott Oct 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"powershell": {
"version": "7.3.6",
"version": "7.3.8",
"commands": [
"pwsh"
]
Expand All @@ -15,7 +15,7 @@
]
},
"dotnet-coverage": {
"version": "17.8.4",
"version": "17.9.3",
"commands": [
"dotnet-coverage"
]
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
FROM mcr.microsoft.com/dotnet/sdk:7.0.302-jammy
FROM mcr.microsoft.com/dotnet/sdk:7.0.401-jammy

# Installing mono makes `dotnet test` work without errors even for net472.
# But installing it takes a long time, so it's excluded by default.
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<BaseIntermediateOutputPath>$(RepoRootPath)obj\$([MSBuild]::MakeRelative($(RepoRootPath), $(MSBuildProjectDirectory)))\</BaseIntermediateOutputPath>
<BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
<PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
<LangVersion>latest</LangVersion>
<LangVersion>11</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<AnalysisLevel>latest</AnalysisLevel>
Expand Down
8 changes: 5 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<MicroBuildVersion>2.0.137</MicroBuildVersion>
<MicroBuildVersion>2.0.146</MicroBuildVersion>
<CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
<CodeAnalysisVersion Condition="'$(IsTestProject)'=='true'">4.4.0</CodeAnalysisVersion>
<CodefixTestingVersion>1.1.1</CodefixTestingVersion>
Expand Down Expand Up @@ -31,15 +31,17 @@
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.188-beta" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="xunit" Version="2.5.0" />
<PackageVersion Include="xunit" Version="2.5.3" />
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.5.25" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.302",
"version": "7.0.401",
"rollForward": "patch",
"allowPrerelease": false
},
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<!-- Include and reference README in nuge package, if a README is in the project directory. -->
<!-- Include and reference README in nuget package, if a README is in the project directory. -->
<PropertyGroup>
<PackageReadmeFile Condition="Exists('README.md')">README.md</PackageReadmeFile>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions test/IsolatedTestHost/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.5.3.0" newVersion="2.5.3.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="xunit.execution.desktop" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.5.3.0" newVersion="2.5.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
5 changes: 5 additions & 0 deletions test/Microsoft.VisualStudio.Threading.Tests/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[*.cs]
# xUnit1030: Test methods should not call ConfigureAwait(false)
dotnet_diagnostic.xUnit1030.severity = none
# xUnit1031: Test methods should not use blocking task operations
dotnet_diagnostic.xUnit1031.severity = none