Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 9 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
<_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\</_OutputPath>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<ProduceReferenceAssemblyInOutDir>true</ProduceReferenceAssemblyInOutDir>

<!--
Workaround for https://github.com/NuGet/Home/issues/6461 (VSWin Only)
Even though we don't build NuGet packages, it still attempts to build the NuGet package name, which includes
the assembly version if PackageVersion isn't specified. Because our assemblies have different versions
per-TFM, that causes a problem because the package can't have multiple versions in it.
Set a dummy PackageVersion because we don't actually need it.
-->
<PackageVersion>1.0.0.0</PackageVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we'd change this if we ever ship a NuGet package from this repo? Maybe wouldn't happen.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we could drop this hack when we no longer target classic.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If (when?) we ever ship a NuGet package from this repo, it should presumably match the version of Java.Interop.dll, which will match the .NET version it's shipping with (6.0.0.0, 7.0.0.0, etc.).

Thus, perhaps we should set $(PackageVersion)=6.0.0.0?

Copy link
Contributor Author

@jpobst jpobst Apr 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that we have no intentions of releasing a NuGet package from this repo, I suspect a 6.0.0.0 version number will be just as obsolete as 1.0.0.0 if we ever do ship a package. 😁

</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions tools/generator/generator.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"solution": {
"path": "..\\..\\Java.Interop.sln",
"projects": [
"external\\xamarin-android-tools\\src\\Xamarin.Android.Tools.AndroidSdk\\Xamarin.Android.Tools.AndroidSdk.csproj",
"src\\Java.Interop.Localization\\Java.Interop.Localization.csproj",
"src\\Java.Interop.Tools.Cecil\\Java.Interop.Tools.Cecil.csproj",
"src\\Java.Interop.Tools.Diagnostics\\Java.Interop.Tools.Diagnostics.csproj",
"src\\Java.Interop.Tools.Generator\\Java.Interop.Tools.Generator.csproj",
"src\\Java.Interop.Tools.JavaCallableWrappers\\Java.Interop.Tools.JavaCallableWrappers.csproj",
"src\\Java.Interop.Tools.JavaSource\\Java.Interop.Tools.JavaSource.csproj",
"src\\Java.Interop.Tools.JavaTypeSystem\\Java.Interop.Tools.JavaTypeSystem.csproj",
"src\\Xamarin.Android.Tools.AnnotationSupport\\Xamarin.Android.Tools.AnnotationSupport.csproj",
"src\\Xamarin.Android.Tools.ApiXmlAdjuster\\Xamarin.Android.Tools.ApiXmlAdjuster.csproj",
Expand Down