warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Bumps source generator to netstandard2.1 (#874)

Browse source
This commit is contained in:
Kamron Batman 2021-12-04 11:58:59 -08:00 • committed by GitHub
parent 08baf3c35d
commit 7da6cec27e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-test.yml vendored
View file

@ -30,4 +30,4 @@ jobs:
- name: Build
run: ./publish.cmd
- name: Test
run: dotnet test --no-restore --framework net6.0
run: dotnet test --no-restore

8
Projects/SerializationGenerator/SerializationGenerator.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>preview</LangVersion>
<BuildOutputTargetFolder>analyzers</BuildOutputTargetFolder>
</PropertyGroup>
@ -21,9 +21,9 @@
<Target Name="GetDependencyTargetPaths">
<ItemGroup>
<TargetPathWithTargetPlatformMoniker Include="$(PKGHumanizer_Core)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Json)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Bcl_AsyncInterfaces)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Json)\lib\netstandard2.1\*.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.1\*.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Bcl_AsyncInterfaces)\lib\netstandard2.1\*.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
</Target>
</Project>

1
Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
View file

@ -12,6 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.13.14" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.1" />

2
Projects/Server/Server.csproj
View file

@ -40,7 +40,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
<SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
<OutputItemType>Analyzer</OutputItemType>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<PrivateAssets>all</PrivateAssets>

2
Projects/UOContent/UOContent.csproj
View file

@ -47,7 +47,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
<SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
<OutputItemType>Analyzer</OutputItemType>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<PrivateAssets>all</PrivateAssets>

16
azure-pipelines.yml
View file

@ -14,11 +14,6 @@ jobs:
vmImage: 'windows-latest'
steps:
- task: UseDotNet@2
displayName: 'Install .NET 5'
inputs:
packageType: sdk
version: 5.0.403
- task: UseDotNet@2
displayName: 'Install .NET 6'
inputs:
@ -27,7 +22,7 @@ jobs:
- task: NuGetAuthenticate@0
- script: ./publish.cmd Release win
displayName: 'Build'
- script: dotnet test --no-restore --framework net6.0
- script: dotnet test --no-restore
displayName: 'Test'
- job: BuildLinux
@ -46,7 +41,7 @@ jobs:
# containerImage: amd64/buildpack-deps:bullseye
# os: debian.11-x64
'Ubuntu 20':
containerImage: mcr.microsoft.com/dotnet/sdk:5.0-focal
containerImage: mcr.microsoft.com/dotnet/sdk:6.0-focal
os: ubuntu.20.04
'Fedora 32':
containerImage: fedora:32
@ -63,11 +58,6 @@ jobs:
container: $[ variables['containerImage'] ]
steps:
- task: UseDotNet@2
displayName: 'Install .NET 5'
inputs:
packageType: sdk
version: 5.0.403
- task: UseDotNet@2
displayName: 'Install .NET 6'
inputs:
@ -76,5 +66,5 @@ jobs:
- task: NuGetAuthenticate@0
- script: ./publish.cmd Release $(os)
displayName: 'Build'
- script: dotnet test --no-restore --framework net6.0
- script: dotnet test --no-restore
displayName: 'Test'