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
3 changes: 3 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
<PropertyGroup>
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>

<!-- Default to including all projects in any SlnGen solution, as NoTargets projects are not included by default -->
<IncludeInSolutionFile>true</IncludeInSolutionFile>

<!-- Default to not packaging a project. Override per-project where dotnet sdk nuget packaging
is desired. -->
<IsPackable Condition="'$(IsPackable)' == ''">false</IsPackable>
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
</PropertyGroup>

<ItemGroup Label="Packaging">
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
</ItemGroup>
<ItemGroup Label="Testing">
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageVersion Include="MSBuild.ProjectCreation" Version="12.0.1" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="MSBuild.ProjectCreation" Version="15.0.0" />
<PackageVersion Include="xunit.v3" Version="3.0.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"rollForward": "major"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23"
"Microsoft.Build.NoTargets": "3.7.134",
"Microsoft.Build.Traversal": "4.1.82"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ public void RespectsGlobalProperties(Dictionary<string, string> envVars)

public static TheoryData<Dictionary<string, string>> MemberData()
{
return new TheoryData<Dictionary<string, string>>
{
{ new() { ["TF_BUILD"] = "True" } },
{ new() { ["GITHUB_ACTIONS"] = "true" } },
{ new() { ["APPVEYOR"] = "True" } },
{ new() { ["CI"] = "true" } },
{ new() { ["TRAVIS"] = "true" } },
{ new() { ["CIRCLECI"] = "true" } },
{ new() { ["CODEBUILD_BUILD_ID"] = "abc:123", ["AWS_REGION"] = "us-east-1" } },
{ new() { ["BUILD_ID"] = "123", ["BUILD_URL"] = "https://buildserver.invalid/jenkins/job/MyJobName/123/" } },
{ new() { ["BUILD_ID"] = "123", ["PROJECT_ID"] = "234" } },
{ new() { ["TEAMCITY_VERSION"] = "10" } },
{ new() { ["JB_SPACE_API_URL"] = "https://api.invalid/url" } },
};
return
[
new TheoryDataRow<Dictionary<string, string>>(new() { ["TF_BUILD"] = "True" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["GITHUB_ACTIONS"] = "true" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["APPVEYOR"] = "True" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["CI"] = "true" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["TRAVIS"] = "true" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["CIRCLECI"] = "true" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["CODEBUILD_BUILD_ID"] = "abc:123", ["AWS_REGION"] = "us-east-1" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["BUILD_ID"] = "123", ["BUILD_URL"] = "https://buildserver.invalid/jenkins/job/MyJobName/123/" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["BUILD_ID"] = "123", ["PROJECT_ID"] = "234" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["TEAMCITY_VERSION"] = "10" }),
new TheoryDataRow<Dictionary<string, string>>(new() { ["JB_SPACE_API_URL"] = "https://api.invalid/url" }),
];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSBuild.ProjectCreation" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down