diff --git a/Dockerfile b/Dockerfile index e6acc81e..e7ad14f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN ./build/Extract-Resource.ps1 -File "$(find ~/.nuget/packages/mysql.data/ -na COPY . ./ -RUN dotnet publish -v q -nologo --no-restore product/roundhouse.console -o /app/out -p:TargetFramework=netcoreapp2.1 -p:Version="${VERSION}" -p:Configuration=Build -p:Platform="Any CPU" +RUN dotnet publish -v q -nologo --no-restore product/roundhouse.console -o /app/out -p:TargetFramework=netcoreapp3.1 -p:Version="${VERSION}" -p:Configuration=Build -p:Platform="Any CPU" FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 diff --git a/build.ps1 b/build.ps1 index f8f00115..abbb2611 100755 --- a/build.ps1 +++ b/build.ps1 @@ -54,13 +54,13 @@ dotnet pack -nologo --no-build -v q -p:Version="$($gitVersion.FullSemVer)" -p:No nuget pack product/roundhouse.console/roundhouse.nuspec -OutputDirectory "$CODEDROP/packages" -Verbosity quiet -NoPackageAnalysis -Version "$($gitVersion.FullSemVer)" msbuild /t:"Pack" product/roundhouse.tasks/roundhouse.tasks.csproj /p:DropFolder=$CODEDROP /p:Version="$($gitVersion.FullSemVer)" /p:NoPackageAnalysis=true /nologo /v:q /fl /flp:"LogFile=$LOGDIR/msbuild.roundhouse.tasks.pack.log;Verbosity=n" /p:Configuration=Build /p:Platform="Any CPU" -" - netcoreapp2.1 global tool dotnet-roundhouse" +" - netcoreapp3.1 global tool dotnet-roundhouse" -dotnet publish -v q -nologo --no-restore product/roundhouse.console -p:NoPackageAnalysis=true -p:TargetFramework=netcoreapp2.1 -p:Version="$($gitVersion.FullSemVer)" -p:Configuration=Build -p:Platform="Any CPU" -dotnet pack -v q -nologo --no-restore --no-build product/roundhouse.console -p:NoPackageAnalysis=true -p:TargetFramework=netcoreapp2.1 -o ${PACKAGEDIR} -p:Version="$($gitVersion.FullSemVer)" -p:Configuration=Build -p:Platform="Any CPU" +dotnet publish -v q -nologo --no-restore product/roundhouse.console -p:NoPackageAnalysis=true -p:TargetFramework=netcoreapp3.1 -p:Version="$($gitVersion.FullSemVer)" -p:Configuration=Build -p:Platform="Any CPU" +dotnet pack -v q -nologo --no-restore --no-build product/roundhouse.console -p:NoPackageAnalysis=true -p:TargetFramework=netcoreapp3.1 -o ${PACKAGEDIR} -p:Version="$($gitVersion.FullSemVer)" -p:Configuration=Build -p:Platform="Any CPU" -# " * Packaging netcoreapp2.1 global tool dotnet-roundhouse`n" +# " * Packaging netcoreapp3.1 global tool dotnet-roundhouse`n" # nuget pack -Verbosity quiet -outputdirectory ${PACKAGEDIR} .\product\roundhouse.console\roundhouse.tool.nuspec -Properties "Version=$($gitVersion.FullSemVer);NoPackageAnalysis=true" diff --git a/product/roundhouse.console/roundhouse.console.csproj b/product/roundhouse.console/roundhouse.console.csproj index 390d6a49..0fd73481 100644 --- a/product/roundhouse.console/roundhouse.console.csproj +++ b/product/roundhouse.console/roundhouse.console.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;net461 + netcoreapp3.1;net461 net461 true true @@ -18,7 +18,7 @@ $(Version) - + roundhouse.tool.nuspec @@ -45,8 +45,11 @@ false - - + + + + + @@ -86,7 +89,7 @@ - + @@ -99,7 +102,7 @@ mergedExe=$(CopyDestination);version=$(NugetVersion) - + roundhouse.tool.nuspec version=$(NugetVersion) diff --git a/product/roundhouse.console/roundhouse.tool.nuspec b/product/roundhouse.console/roundhouse.tool.nuspec index f50820cc..28964096 100644 --- a/product/roundhouse.console/roundhouse.tool.nuspec +++ b/product/roundhouse.console/roundhouse.tool.nuspec @@ -16,12 +16,12 @@ - + images/RoundhousE_Logo.NuGet.jpg - + diff --git a/product/roundhouse.test.merged/roundhouse.test.merged.csproj b/product/roundhouse.test.merged/roundhouse.test.merged.csproj index 2b0a3ae4..193379eb 100644 --- a/product/roundhouse.test.merged/roundhouse.test.merged.csproj +++ b/product/roundhouse.test.merged/roundhouse.test.merged.csproj @@ -1,6 +1,6 @@  - + net461 true true diff --git a/product/roundhouse.tests/roundhouse.tests.csproj b/product/roundhouse.tests/roundhouse.tests.csproj index 3f92bf12..527aab5d 100644 --- a/product/roundhouse.tests/roundhouse.tests.csproj +++ b/product/roundhouse.tests/roundhouse.tests.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;net461 + netcoreapp3.1;net461 true true Library diff --git a/roundhouse.sln b/roundhouse.sln index 7e6df7f5..5075c673 100644 --- a/roundhouse.sln +++ b/roundhouse.sln @@ -49,8 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "roundhouse.test.merged", "p EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "roundhouse.core", "product\roundhouse.core\roundhouse.core.csproj", "{328AA2A7-D213-46EB-861E-5D9CA94F8BFD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "roundhouse.console.tests", "product\roundhouse.console.tests\roundhouse.console.tests.csproj", "{8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Build|Any CPU = Build|Any CPU @@ -148,12 +146,6 @@ Global {328AA2A7-D213-46EB-861E-5D9CA94F8BFD}.Debug|Any CPU.Build.0 = Debug|Any CPU {328AA2A7-D213-46EB-861E-5D9CA94F8BFD}.Release|Any CPU.ActiveCfg = Release|Any CPU {328AA2A7-D213-46EB-861E-5D9CA94F8BFD}.Release|Any CPU.Build.0 = Release|Any CPU - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}.Build|Any CPU.ActiveCfg = Debug|Any CPU - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}.Build|Any CPU.Build.0 = Debug|Any CPU - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -170,7 +162,6 @@ Global {41CE538E-E6F1-4AB6-AB66-508DEF669A39} = {BCFAF88B-B6C0-48C1-B23E-FCC95B75588C} {3447F080-CF50-4B02-9521-671E7AEE8D34} = {BCFAF88B-B6C0-48C1-B23E-FCC95B75588C} {729625F9-E8E5-472B-BAA8-F7DEDACBD700} = {807C6B2C-496F-4A41-ABFE-EA5478EB9CFF} - {8A5A3D22-F391-4C5E-8540-B34D6C74A8D1} = {807C6B2C-496F-4A41-ABFE-EA5478EB9CFF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {54AD825C-DC48-4C69-88E5-356B43AC3674}