Skip to content

#349 [Jorge] Updating target framework to use dotnet core 3.1 #350

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

Open
jorgegarcia93 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#349 [Jorge] Updating target framework to use dotnet core 3.1 #350

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
9 changes: 3 additions & 6 deletions src/NLU.DevOps.CommandLine.Tests/NLU.DevOps.CommandLine.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,20 @@
<Import Project="..\CodeAnalysis.props" />
<Import Project="..\CodeCoverage.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>
<Target Name="PublishProviders"
BeforeTargets="CoreBuild">
<Target Name="PublishProviders" BeforeTargets="CoreBuild">
<ItemGroup>
<PluginProject Include="..\NLU.DevOps.Luis\NLU.DevOps.Luis.csproj" />
<PluginProject Include="..\NLU.DevOps.LuisV3\NLU.DevOps.LuisV3.csproj" />
<PluginProject Include="..\NLU.DevOps.Lex\NLU.DevOps.Lex.csproj" />
<PluginProject Include="..\NLU.DevOps.Dialogflow\NLU.DevOps.Dialogflow.csproj" />
</ItemGroup>

<MSBuild Projects="@(PluginProject)"
Targets="Publish"
Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
<MSBuild Projects="@(PluginProject)" Targets="Publish" Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
</Target>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.5.3" />
Expand Down
9 changes: 3 additions & 6 deletions src/NLU.DevOps.CommandLine/NLU.DevOps.CommandLine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CommonNuget.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>dotnet-nlu</AssemblyName>
<PackAsTool>true</PackAsTool>
</PropertyGroup>
Expand All @@ -16,8 +16,7 @@
<TargetsForTfmSpecificContentInPackage>PublishProviders;$(TargetsForTfmSpecificContentInPackage)</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>

<Target Name="PublishProviders"
BeforeTargets="CoreBuild">
<Target Name="PublishProviders" BeforeTargets="CoreBuild">

<ItemGroup>
<PluginProject Include="..\NLU.DevOps.Luis\NLU.DevOps.Luis.csproj" />
Expand All @@ -26,9 +25,7 @@
<PluginProject Include="..\NLU.DevOps.Dialogflow\NLU.DevOps.Dialogflow.csproj" />
</ItemGroup>

<MSBuild Projects="@(PluginProject)"
Targets="Publish"
Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
<MSBuild Projects="@(PluginProject)" Targets="Publish" Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />

<ItemGroup>
<TfmSpecificPackageFile Include="$(TargetDir)providers\**\*">
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Core.Tests/NLU.DevOps.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CodeCoverage.props" />

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Core/NLU.DevOps.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\CommonNuget.props" />
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Dialogflow.Tests/NLU.DevOps.Dialogflow.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CodeCoverage.props" />

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Dialogflow/NLU.DevOps.Dialogflow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<AssemblyName>dotnet-nlu-dialogflow</AssemblyName>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Lex.Tests/NLU.DevOps.Lex.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\CodeAnalysis.props" />
<Import Project="..\CodeCoverage.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Lex/NLU.DevOps.Lex.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<AssemblyName>dotnet-nlu-lex</AssemblyName>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Luis.Tests/NLU.DevOps.Luis.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CodeCoverage.props" />
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<DefineConstants>$(DefineConstants);LUIS_V2</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Luis/NLU.DevOps.Luis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<AssemblyName>dotnet-nlu-luis</AssemblyName>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DefineConstants>$(DefineConstants);LUIS_V2</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.LuisV3.Tests/NLU.DevOps.LuisV3.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CodeCoverage.props" />
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<DefineConstants>$(DefineConstants);LUIS_V3</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.LuisV3/NLU.DevOps.LuisV3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<AssemblyName>dotnet-nlu-luisV3</AssemblyName>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RootNamespace>NLU.DevOps.Luis</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.MockProvider/NLU.DevOps.MockProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<AssemblyName>dotnet-nlu-mock</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<PackAsTool>true</PackAsTool>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.ModelPerformance.Tests/NLU.DevOps.ModelPerformance.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\CodeAnalysis.props" />
<Import Project="..\CodeCoverage.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.ModelPerformance/NLU.DevOps.ModelPerformance.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\CodeAnalysis.props" />
<Import Project="..\CodeCoverage.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
Expand Down
2 changes: 1 addition & 1 deletion src/NLU.DevOps.Models/NLU.DevOps.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\CommonNuget.props" />
<Import Project="..\CodeAnalysis.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
Expand Down
8 changes: 6 additions & 2 deletions src/NLU.DevOps.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.757
# Visual Studio Version 17
VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLU.DevOps.Models", "NLU.DevOps.Models\NLU.DevOps.Models.csproj", "{6B6B7069-F43F-43AD-87EB-7F0B7583404E}"
EndProject
Expand Down Expand Up @@ -42,7 +42,11 @@ EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
NLU.DevOps.Luis.Shared\NLU.DevOps.Luis.Shared.projitems*{03cc905a-48d1-466c-a816-e19bf944a7ee}*SharedItemsImports = 13
NLU.DevOps.Luis.Tests.Shared\NLU.DevOps.Luis.Tests.Shared.projitems*{280b55da-272d-44d5-ae73-8730ca96ec0b}*SharedItemsImports = 5
NLU.DevOps.Luis.Shared\NLU.DevOps.Luis.Shared.projitems*{874c5d08-0dd9-4385-878a-0fb7cd6a4314}*SharedItemsImports = 5
NLU.DevOps.Luis.Shared\NLU.DevOps.Luis.Shared.projitems*{b52ddc83-32c8-4dca-8c39-8dbd0a550382}*SharedItemsImports = 5
NLU.DevOps.Luis.Tests.Shared\NLU.DevOps.Luis.Tests.Shared.projitems*{d7f8ef09-9289-432d-9255-677844f96a5b}*SharedItemsImports = 13
NLU.DevOps.Luis.Tests.Shared\NLU.DevOps.Luis.Tests.Shared.projitems*{f5ce52e9-c95f-4601-9575-c654c619a767}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down