Browse Source

Revert SDK bump

pull/1574/head
James Jackson-South 6 years ago
parent
commit
9409f3a15f
  1. 4
      .github/workflows/build-and-test.yml
  2. 13
      src/Directory.Build.targets

4
.github/workflows/build-and-test.yml

@ -55,7 +55,7 @@ jobs:
- name: Setup DotNet SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: "3.1.x"
dotnet-version: "3.1.101"
- name: Build
shell: pwsh
@ -99,7 +99,7 @@ jobs:
- name: Setup DotNet SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: "3.1.x"
dotnet-version: "3.1.101"
- name: Pack
shell: pwsh

13
src/Directory.Build.targets

@ -20,6 +20,17 @@
<GeneratedInternalsVisibleToFile Condition="'$(GeneratedInternalsVisibleToFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)</GeneratedInternalsVisibleToFile>
</PropertyGroup>
<!-- Workaround for using SDK < 3.1.300, which we cannot use since it breaks coverlet -->
<!-- https://github.com/clairernovotny/DeterministicBuilds -->
<Project>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>
</Project>
<ItemDefinitionGroup>
<InternalsVisibleTo>
<Visible>false</Visible>
@ -51,7 +62,7 @@
<!-- Empty target so that `dotnet test` will work on the solution -->
<!-- https://github.com/Microsoft/vstest/issues/411 -->
<Target Name="VSTest" Condition="'$(IsTestProject)' == 'true'"/>
<ItemGroup>
<!--Shared config files that have to exist at root level.-->
<ConfigFilesToCopy Include="..\..\shared-infrastructure\.editorconfig;..\..\shared-infrastructure\.gitattributes" />

Loading…
Cancel
Save