Skip to content

Target .NET Core 3.0 #34

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

Merged
jeffkl merged 1 commit into from
Oct 21, 2019
Merged

Target .NET Core 3.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Update="Microsoft.Build" Version="16.0.461" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Update="Microsoft.Build" Version="16.3.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
<PackageReference Update="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Update="MSTest.TestFramework" Version="1.1.18" />
Expand All @@ -12,8 +12,8 @@
</ItemGroup>

<ItemGroup>
<GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="1.0.68" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="2.3.167" Condition=" '$(EnableGitVersioning)' != 'false' " />
<GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="2.0.1" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.0.26" Condition=" '$(EnableGitVersioning)' != 'false' " />
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" Condition=" '$(EnableStyleCopAnalyzers)' != 'false' " />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.36"
"Microsoft.Build.CentralPackageVersions": "2.0.52"
}
}
2 changes: 1 addition & 1 deletion src/MSBuildProjectCreator.UnitTests/MSBuildProjectCreator.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>Microsoft.Build.Utilities.ProjectCreation.UnitTests</AssemblyName>
<RootNamespace>Microsoft.Build.Utilities.ProjectCreation.UnitTests</RootNamespace>
Expand Down
6 changes: 3 additions & 3 deletions src/MSBuildProjectCreator/MSBuildProjectCreator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46;netcoreapp2.1;net472</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net46;netcoreapp2.1;net472;netcoreapp3.0</TargetFrameworks>
<RootNamespace>Microsoft.Build.Utilities.ProjectCreation</RootNamespace>
<AssemblyName>Microsoft.Build.Utilities.ProjectCreation</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ArtifactsPath>..\..\artifacts\$(MSBuildProjectName)</ArtifactsPath>
<CopyArtifactsAfterTargets>Pack</CopyArtifactsAfterTargets>
<DefaultArtifactsFileMatch>*nupkg</DefaultArtifactsFileMatch>
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1'">$(DefineConstants);NETCORE</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'">$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>

<PropertyGroup Label="Package properties">
Expand All @@ -27,7 +27,7 @@
<PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" VersionOverride="15.9.20" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'net472'">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'net472'">
<PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" />
</ItemGroup>

Expand Down