Prechádzať zdrojové kódy

switched to Directory.Packages.Props

vpenades 2 rokov pred
rodič
commit
33e0715ea7

+ 24 - 0
Directory.Packages.props

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="AssimpNet" Version="5.0.0-beta1" />
+    <PackageVersion Include="ErrorProne.NET.Structs" Version="0.4.0-beta.1" />
+    <PackageVersion Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageVersion Include="MonoGame.Framework.iOS" Version="3.8.1.303" />
+    <PackageVersion Include="MonoGame.Framework.Android" Version="3.8.1.303" />
+    <PackageVersion Include="MonoGame.Framework.DesktopGL" Version="3.8.1.2082-develop" />
+    <PackageVersion Include="MonoGame.Framework.WindowsDX" Version="3.8.1.2082-develop" />
+    <PackageVersion Include="MonoGame.Framework.WindowsDX.9000" Version="3.8.9101" />
+    <PackageVersion Include="nkast.LibOVR" Version="1.0.0" />
+    <PackageVersion Include="nkast.Xna.Framework.Oculus.OvrDX11" Version="3.8.9101.1" />
+    <PackageVersion Include="PropertyTools.Wpf" Version="3.1.0" />
+    <PackageVersion Include="SharpGLTF.Core" Version="1.0.0-alpha0027" />
+    <PackageVersion Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0027" />
+    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
+</Project>

+ 4 - 3
demos/Demo1/Demo1.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -25,8 +26,8 @@
   </ItemGroup>  
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" />
   </ItemGroup>
   
   <ItemGroup>

+ 4 - 3
demos/Demo2/Demo2.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -25,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" />
   </ItemGroup>
   
   <ItemGroup>

+ 4 - 3
demos/Demo3/Demo3.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -25,8 +26,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" />
   </ItemGroup>
   
   <ItemGroup>

+ 5 - 4
demos/Demo4.VR/Demo4.VR.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
     <TargetFramework>net6.0-windows7.0</TargetFramework>
@@ -19,9 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.8.9101" />
-    <PackageReference Include="nkast.Xna.Framework.Oculus.OvrDX11" Version="3.8.9101.1" />
-    <PackageReference Include="nkast.LibOVR" Version="1.0.0" />    
+    <PackageReference Include="MonoGame.Framework.WindowsDX.9000" />
+    <PackageReference Include="nkast.Xna.Framework.Oculus.OvrDX11" />
+    <PackageReference Include="nkast.LibOVR" />    
   </ItemGroup>  
 
   <ItemGroup>

+ 4 - 3
demos/Demo5.Android/Demo5.Android.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net6.0-android</TargetFramework>
@@ -10,8 +11,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" />
+    <PackageReference Include="MonoGame.Framework.Android" />
   </ItemGroup>
   
   <Target Name="RestoreDotnetTools" BeforeTargets="Restore">

+ 1 - 1
demos/Demo5.Android/Game1.cs

@@ -17,7 +17,7 @@ namespace Demo5
 
         protected override void Initialize()
         {
-            this.Window.Title = "SharpGLTF - MonoGame Demo 2";
+            this.Window.Title = "SharpGLTF - MonoGame Demo 5";
             this.Window.AllowUserResizing = true;
             this.Window.AllowAltF4 = true;
 

+ 1 - 1
demos/Directory.Build.props

@@ -45,7 +45,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="ErrorProne.NET.Structs" Version="0.4.0-beta.1">
+    <PackageReference Update="ErrorProne.NET.Structs">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

+ 5 - 4
demos/MonoSceneViewer/MonoSceneViewer.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -8,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.2082-develop" />
-    <PackageReference Include="PropertyTools.Wpf" Version="3.1.0" />
-    <PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0027" />    
+    <PackageReference Include="MonoGame.Framework.WindowsDX" />
+    <PackageReference Include="PropertyTools.Wpf" />
+    <PackageReference Include="SharpGLTF.Toolkit" />    
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
src/Directory.Build.props

@@ -39,7 +39,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="ErrorProne.NET.Structs" Version="0.4.0-beta.1">
+    <PackageReference Update="ErrorProne.NET.Structs">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

+ 6 - 6
src/MonoGameFramework.props

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
 
   <PropertyGroup>
@@ -7,20 +7,20 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameNetStandardVersion)" PrivateAssets="all" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="all" />
+    <PackageReference Include="System.Memory" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameNetStandardVersion)" PrivateAssets="all" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" PrivateAssets="all" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" PrivateAssets="all" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="all" />
   </ItemGroup>  
 
 </Project>

+ 4 - 3
src/MonoScene.Pipeline.Assimp/MonoScene.Pipeline.Assimp.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
@@ -6,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AssimpNet" Version="5.0.0-beta1" />
+    <PackageReference Include="AssimpNet" />
   </ItemGroup>
 
-  <Import Project="..\MonoGameFramework.props"/>
+  <Import Project="..\MonoGameFramework.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\MonoScene.Pipeline\MonoScene.Pipeline.csproj" />

+ 3 - 2
src/MonoScene.Pipeline.GLTF/MonoScene.Pipeline.GLTF.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
@@ -11,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>    
-    <PackageReference Include="SharpGLTF.Core" Version="1.0.0-alpha0027" />    
+    <PackageReference Include="SharpGLTF.Core" />    
   </ItemGroup>
 
   <Import Project="..\MonoGameFramework.props" />

+ 4 - 3
src/MonoScene.Runtime.Scene3D/MonoGame.Framework.Graphics.Scene3D.csproj

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -7,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.1825-develop" PrivateAssets="all" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="all" />
+    <PackageReference Include="System.Memory" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
 
   <ItemGroup>