diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index abfe14187..d6fd5ad40 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -22,12 +22,12 @@ jobs: - name: Setup .NET 5 uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.100-rc.2.20479.15 + dotnet-version: 5.0.100 - name: Restore NuGet Packages run: dotnet restore --force-evaluate - name: Build Server - run: dotnet build -c Release -f net5.0 --no-restore Projects/Server/Server.csproj + run: dotnet build -c Release --no-restore Projects/Server/Server.csproj - name: Build UO Content - run: dotnet build -c Release -f net5.0 --no-restore Projects/UOContent/UOContent.csproj + run: dotnet build -c Release --no-restore Projects/UOContent/UOContent.csproj - name: Test - run: dotnet test --no-restore -f net5.0 + run: dotnet test --no-restore diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 9c5a013ba..83e6b9dfb 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET 5 uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.100-rc.2.20479.15 + dotnet-version: 5.0.100 - uses: dotnet/nbgv@master id: nbgv - name: Create Release @@ -53,7 +53,7 @@ jobs: - name: Setup .NET 5 uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.100-rc.2.20479.15 + dotnet-version: 5.0.100- - uses: dotnet/nbgv@master id: nbgv - name: Load Release URL File from release job diff --git a/Directory.Build.props b/Directory.Build.props index d7f7a4bae..75b5eadae 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Kamron Batman ModernUO 2019-2020 - netcoreapp3.1;net5.0 + net5.0 x64 x64 9 diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj index 659d5f4d5..825ce1e4c 100644 --- a/Projects/Server.Tests/Server.Tests.csproj +++ b/Projects/Server.Tests/Server.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj index 6415a2ad2..ece31320f 100644 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -27,10 +27,10 @@ - all - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index 6e8449f43..34abf1813 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -30,11 +30,11 @@ - all - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/README.md b/README.md index dd5d74890..c25dc7bd4 100644 --- a/README.md +++ b/README.md @@ -21,22 +21,19 @@ ModernUO [![Discord](https://img.shields.io/discord/751317910504603701?logo=disc [![GitHub build](https://img.shields.io/github/workflow/status/modernuo/ModernUO/Build?logo=github)](https://github.com/modernuo/ModernUO/actions) [![AzurePipelines build](https://dev.azure.com/modernuo/modernuo/_apis/build/status/Build?branchName=master)](https://dev.azure.com/modernuo/modernuo/_build/latest?definitionId=1&branchName=master) -## Goals -- See [Goals](./GOALS.md) - -## Publishing a build +## Building the server #### Requirements - [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0) #### Publishing Builds - Using terminal or powershell: `./publish.cmd [release|debug (default: release)] [os]` - - Supported `os`: - - `win` for Windows 8/10/2019 - - `osx` for MacOS - - `ubuntu.16.04`, `ubuntu.18.04` `ubuntu.20.04` for Ubuntu LTS - - `debian.9`, `debian.10` for Debian - - `centos.7`, `centos.8` for CentOS - - If blank, the host operating system is used + - `os` - [Supported operating systems](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md) + - `win` - Windows 8.1/10/2016/2019 + - `osx` - MacOS + - `ubuntu.16.04`, `ubuntu.18.04` `ubuntu.20.04` - Ubuntu LTS + - `debian.9`, `debian.10` - Debian + - `centos.7`, `centos.8` - CentOS + - If blank, the operating system running the build is used ## Deploying / Running Server - Follow the [publish](https://github.com/modernuo/ModernUO#publishing-a-build) instructions diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7ddc4327c..ec1d79c5b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,7 +4,6 @@ trigger: - master variables: - buildConfiguration: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1 @@ -19,15 +18,15 @@ jobs: displayName: 'Install .NET 5' inputs: packageType: sdk - version: '5.0.100-rc.2.20479.15' + version: '5.0.100' - task: NuGetAuthenticate@0 - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json displayName: 'Restore NuGet Packages' - - script: dotnet build -r win-x64 -c $(buildConfiguration) -f net5.0 --no-restore Projects/Server/Server.csproj + - script: dotnet build -r win-x64 -c Release --no-restore Projects/Server/Server.csproj displayName: 'Build Server' - - script: dotnet build -r win-x64 -c $(buildConfiguration) -f net5.0 --no-restore Projects/UOContent/UOContent.csproj + - script: dotnet build -r win-x64 -c Release --no-restore Projects/UOContent/UOContent.csproj displayName: 'Build UO Content' - - script: dotnet test --no-restore -f net5.0 + - script: dotnet test --no-restore displayName: 'Test' - job: BuildLinux @@ -70,13 +69,13 @@ jobs: displayName: 'Install .NET 5' inputs: packageType: sdk - version: '5.0.100-rc.2.20479.15' + version: '5.0.100' - task: NuGetAuthenticate@0 - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json displayName: 'Restore NuGet Packages' - - script: dotnet build -r $(os) -c $(buildConfiguration) -f net5.0 --no-restore Projects/Server/Server.csproj + - script: dotnet build -r $(os) -c Release --no-restore Projects/Server/Server.csproj displayName: 'Build Server' - - script: dotnet build -r $(os) -c $(buildConfiguration) -f net5.0 --no-restore Projects/UOContent/UOContent.csproj + - script: dotnet build -r $(os) -c Release --no-restore Projects/UOContent/UOContent.csproj displayName: 'Build UO Content' - - script: dotnet test --no-restore -f net5.0 + - script: dotnet test --no-restore displayName: 'Test' diff --git a/publish.cmd b/publish.cmd index b82fd0e08..5af52bb35 100755 --- a/publish.cmd +++ b/publish.cmd @@ -30,10 +30,10 @@ fi echo dotnet restore --force-evaluate dotnet restore --force-evaluate -echo dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj -dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj -echo dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj -dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj +echo dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj +dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj +echo dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj +dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj exit $? :CMDSCRIPT @@ -53,7 +53,7 @@ IF "%~2" == "" ( echo dotnet restore --force-evaluate dotnet restore --force-evaluate -echo dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj -dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj -echo dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj -dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj +echo dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj +dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj +echo dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj +dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj