fix: removed BepInEx.AssemblyPublicizer.MSBuild

Valheim-Modding · Dec 2, 2023 · 00f3dc6 · 00f3dc6
1 parent 72b571b
commit 00f3dc6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 36 deletions.
diff --git a/JotunnDoc/JotunnDoc.csproj b/JotunnDoc/JotunnDoc.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props" Condition="Exists('..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -105,10 +104,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)JotunnLib\BuildProps\Paths.props" />
   <Import Project="$(SolutionDir)JotunnLib\BuildProps\JotunnLibRefsCorlib.props" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props'))" />
-  </Target>
 </Project>
diff --git a/JotunnDoc/packages.config b/JotunnDoc/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BepInEx.AssemblyPublicizer.MSBuild" version="0.4.1" targetFramework="net462" developmentDependency="true" />
   <package id="HarmonyX" version="2.9.0" targetFramework="net462" />
   <package id="Mono.Cecil" version="0.11.4" targetFramework="net462" />
   <package id="MonoMod.RuntimeDetour" version="22.1.29.1" targetFramework="net462" />

diff --git a/JotunnLib/BuildProps/JotunnLibRefsCorlib.props b/JotunnLib/BuildProps/JotunnLibRefsCorlib.props
@@ -1,30 +1,39 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_googleanalytics.dll" Publicize="true">
+    <Reference Include="assembly_googleanalytics_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_googleanalytics_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_guiutils.dll" Publicize="true">
+    <Reference Include="assembly_guiutils_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_guiutils_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_lux.dll" Publicize="true">
+    <Reference Include="assembly_lux_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_lux_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_postprocessing.dll" Publicize="true">
+    <Reference Include="assembly_postprocessing_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_postprocessing_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_simplemeshcombine.dll" Publicize="true">
+    <Reference Include="assembly_simplemeshcombine_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_simplemeshcombine_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_steamworks.dll" Publicize="true">
+    <Reference Include="assembly_steamworks_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_steamworks_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_sunshafts.dll" Publicize="true">
+    <Reference Include="assembly_sunshafts_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_sunshafts_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_utils.dll" Publicize="true">
+    <Reference Include="assembly_utils_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_utils_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <Reference Include="$(VALHEIM_INSTALL)/valheim_Data/Managed/assembly_valheim.dll" Publicize="true">
+    <Reference Include="assembly_valheim_publicized">
+      <HintPath>$(VALHEIM_INSTALL)\valheim_Data\Managed\publicized_assemblies\assembly_valheim_publicized.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="BepInEx">

diff --git a/JotunnLib/JotunnLib.csproj b/JotunnLib/JotunnLib.csproj
@@ -61,9 +61,6 @@
     <None Remove="Unity\AssetBundles\minimapmanager" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="HarmonyX" Version="2.9.0" />
     <PackageReference Include="NuGet.Build.Tasks.Pack" Version="5.10.0">
       <PrivateAssets>all</PrivateAssets>

diff --git a/JotunnTests/JotunnTests.csproj b/JotunnTests/JotunnTests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props" Condition="Exists('..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -71,12 +70,6 @@
   <Import Project="$(SolutionDir)JotunnLib\BuildProps\Paths.props" />
   <Import Project="$(SolutionDir)JotunnLib\BuildProps\JotunnLibRefsCorlib.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/JotunnTests/packages.config b/JotunnTests/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BepInEx.AssemblyPublicizer.MSBuild" version="0.4.1" targetFramework="net462" developmentDependency="true" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net45" />

diff --git a/TestMod/TestMod.csproj b/TestMod/TestMod.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props" Condition="Exists('..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -133,10 +132,4 @@
   </Target>
   <Import Project="$(SolutionDir)JotunnLib\BuildProps\Paths.props" />
   <Import Project="$(SolutionDir)JotunnLib\BuildProps\JotunnLibRefsCorlib.props" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BepInEx.AssemblyPublicizer.MSBuild.0.4.1\build\BepInEx.AssemblyPublicizer.MSBuild.props'))" />
-  </Target>
 </Project>
diff --git a/TestMod/packages.config b/TestMod/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BepInEx.AssemblyPublicizer.MSBuild" version="0.4.1" targetFramework="net462" developmentDependency="true" />
   <package id="HarmonyX" version="2.9.0" targetFramework="net462" />
   <package id="Mono.Cecil" version="0.11.4" targetFramework="net462" />
   <package id="MonoMod.RuntimeDetour" version="22.1.29.1" targetFramework="net462" />