-
-
Notifications
You must be signed in to change notification settings - Fork 21.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64089 from neikeq/dotnet6
- Loading branch information
Showing
242 changed files
with
20,579 additions
and
18,349 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
<Project> | ||
<Import Project="$(MSBuildThisFileDirectory)\SdkPackageVersions.props" /> | ||
<PropertyGroup> | ||
<GodotSdkPackageVersionsFilePath>$(MSBuildThisFileDirectory)\SdkPackageVersions.props</GodotSdkPackageVersionsFilePath> | ||
</PropertyGroup> | ||
<Import Project="$(GodotSdkPackageVersionsFilePath)" /> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<Project> | ||
<PropertyGroup> | ||
<_HasNuGetPackage Condition=" '$(_HasNuGetPackage)' == '' And '$(PackageId)' != '' And '$(GeneratePackageOnBuild.ToLower())' == 'true' ">true</_HasNuGetPackage> | ||
<_HasNuGetPackage Condition=" '$(_HasNuGetPackage)' == '' ">false</_HasNuGetPackage> | ||
</PropertyGroup> | ||
<Target Name="CopyNupkgToSConsOutputDir" AfterTargets="Pack" | ||
Condition=" '$(_HasNuGetPackage)' == 'true' "> | ||
<PropertyGroup> | ||
<GodotSourceRootPath>$(MSBuildThisFileDirectory)\..\..\</GodotSourceRootPath> | ||
<GodotOutputDataDir>$(GodotSourceRootPath)\bin\GodotSharp\</GodotOutputDataDir> | ||
</PropertyGroup> | ||
<Copy SourceFiles="$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$(GodotOutputDataDir)Tools\nupkgs\" /> | ||
</Target> | ||
<Target Name="PushNuGetPackagesToLocalSource" BeforeTargets="Pack" | ||
Condition=" '$(_HasNuGetPackage)' == 'true' And '$(PushNuGetToLocalSource)' != '' "> | ||
<Copy SourceFiles="$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$(PushNuGetToLocalSource)\" /> | ||
</Target> | ||
<Target Name="ClearNuGetLocalPackageCache" BeforeTargets="Pack" | ||
Condition=" '$(_HasNuGetPackage)' == 'true' And '$(ClearNuGetLocalCache.ToLower())' == 'true' "> | ||
<RemoveDir Directories="$(NugetPackageRoot)/$(PackageId.ToLower())/$(PackageVersion)"/> | ||
</Target> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# How to build and run | ||
|
||
1. Build Godot with the module enabled: `module_mono_enabled=yes`. | ||
2. After building Godot, use it to generate the C# glue code: | ||
```sh | ||
<godot_binary> --generate-mono-glue ./modules/mono/glue | ||
``` | ||
3. Build the C# solutions: | ||
```sh | ||
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir ./bin | ||
``` | ||
|
||
The paths specified in these examples assume the command is being run from | ||
the Godot source root. | ||
|
||
# How to deal with NuGet packages | ||
|
||
We distribute the API assemblies, our source generators, and our custom | ||
MSBuild project SDK as NuGet packages. This is all transparent to the user, | ||
but it can make things complicated during development. | ||
|
||
In order to use Godot with a development of those packages, we must create | ||
a local NuGet source where MSBuild can find them. This can be done with | ||
the .NET CLI: | ||
|
||
```sh | ||
dotnet nuget add source ~/MyLocalNugetSource --name MyLocalNugetSource | ||
``` | ||
|
||
The Godot NuGet packages must be added to that local source. Additionally, | ||
we must make sure there are no other versions of the package in the NuGet | ||
cache, as MSBuild may pick one of those instead. | ||
|
||
In order to simplify this process, the `build_assemblies.py` script provides | ||
the following `--push-nupkgs-local` option: | ||
|
||
```sh | ||
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir ./bin \ | ||
--push-nupkgs-local ~/MyLocalNugetSource | ||
``` | ||
|
||
This option ensures the packages will be added to the specified local NuGet | ||
source and that conflicting versions of the package are removed from the | ||
NuGet cache. It's recommended to always use this option when building the | ||
C# solutions during development to avoid mistakes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
<Project> | ||
<PropertyGroup> | ||
<PackageFloatingVersion_Godot>4.0.*-*</PackageFloatingVersion_Godot> | ||
<PackageVersion_Godot_NET_Sdk>4.0.0-dev6</PackageVersion_Godot_NET_Sdk> | ||
<PackageVersion_Godot_SourceGenerators>4.0.0-dev3</PackageVersion_Godot_SourceGenerators> | ||
<PackageVersion_GodotSharp>4.0.0-dev</PackageVersion_GodotSharp> | ||
<PackageVersion_Godot_NET_Sdk>4.0.0-dev8</PackageVersion_Godot_NET_Sdk> | ||
<PackageVersion_Godot_SourceGenerators>4.0.0-dev8</PackageVersion_Godot_SourceGenerators> | ||
</PropertyGroup> | ||
</Project> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.