TAG005 2021/09/22

.NET5向けプロジェクトを追加
kuma4649 · Sep 21, 2021 · bcde647 · bcde647
1 parent b0a9662
commit bcde647
Show file tree

Hide file tree

Showing 43 changed files with 74 additions and 15 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,7 @@
 �X�V����
+TAG005 2021/09/22
+  .NET5�����v���W�F�N�g��ǉ�
+
 TAG004 2020/11/20
   �edll�̍����ւ��̂�
 

diff --git a/M98.sln b/M98.sln
@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "document", "document", "{13
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "M98DotNETcore", "M98DotNETcore\M98DotNETcore.csproj", "{FDE3E446-B00E-44E0-B54A-B08715C679C8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M98DotNET_NET5", "M98DotNET_NET5\M98DotNET_NET5.csproj", "{FEC1D632-E7D3-4B05-AF9C-BFB579AAC8ED}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +33,10 @@ Global
 		{FDE3E446-B00E-44E0-B54A-B08715C679C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FDE3E446-B00E-44E0-B54A-B08715C679C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDE3E446-B00E-44E0-B54A-B08715C679C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEC1D632-E7D3-4B05-AF9C-BFB579AAC8ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEC1D632-E7D3-4B05-AF9C-BFB579AAC8ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEC1D632-E7D3-4B05-AF9C-BFB579AAC8ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEC1D632-E7D3-4B05-AF9C-BFB579AAC8ED}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/M98/bin/Debug/M98DotNETconsole.exe b/M98/bin/Debug/M98DotNETconsole.exe
diff --git a/M98/bin/Debug/M98DotNETconsole.pdb b/M98/bin/Debug/M98DotNETconsole.pdb
diff --git a/M98/bin/Debug/M98DotNETcore.dll b/M98/bin/Debug/M98DotNETcore.dll
diff --git a/M98/bin/Debug/M98DotNETcore.pdb b/M98/bin/Debug/M98DotNETcore.pdb
diff --git a/M98/bin/Debug/musicDriverInterface.dll b/M98/bin/Debug/musicDriverInterface.dll
diff --git a/M98/bin/Release/M98DotNETconsole.exe b/M98/bin/Release/M98DotNETconsole.exe
diff --git a/M98/bin/Release/M98DotNETconsole.pdb b/M98/bin/Release/M98DotNETconsole.pdb
diff --git a/M98/bin/Release/M98DotNETcore.dll b/M98/bin/Release/M98DotNETcore.dll
diff --git a/M98/bin/Release/M98DotNETcore.pdb b/M98/bin/Release/M98DotNETcore.pdb
diff --git a/M98/bin/Release/musicDriverInterface.dll b/M98/bin/Release/musicDriverInterface.dll
diff --git a/M98/obj/Debug/M98DotNETconsole.csproj.CoreCompileInputs.cache b/M98/obj/Debug/M98DotNETconsole.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-18be820bbd59db880ff1f8164dc2d4a416031a09
+ff1be724a291b0677c41b8776eb35b7af4c1391d
diff --git a/M98/obj/Debug/M98DotNETconsole.csproj.FileListAbsolute.txt b/M98/obj/Debug/M98DotNETconsole.csproj.FileListAbsolute.txt
@@ -14,8 +14,8 @@ D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Debug\M98DotNETconsole.pdb
 D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Debug\M98DotNETcore.dll
 D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Debug\musicDriverInterface.dll
 D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Debug\M98DotNETcore.pdb
-D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Debug\M98DotNETconsole.csprojAssemblyReference.cache
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Debug\M98DotNETconsole.csproj.CoreCompileInputs.cache
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Debug\M98DotNETconsole.csproj.CopyComplete
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Debug\M98DotNETconsole.exe
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Debug\M98DotNETconsole.pdb
+D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Debug\M98DotNETconsole.csproj.AssemblyReference.cache
diff --git a/M98/obj/Debug/M98DotNETconsole.csprojAssemblyReference.cache b/M98/obj/Debug/M98DotNETconsole.csprojAssemblyReference.cache
diff --git a/M98/obj/Debug/M98DotNETconsole.exe b/M98/obj/Debug/M98DotNETconsole.exe
diff --git a/M98/obj/Debug/M98DotNETconsole.pdb b/M98/obj/Debug/M98DotNETconsole.pdb
diff --git a/M98/obj/Release/M98DotNETconsole.csproj.FileListAbsolute.txt b/M98/obj/Release/M98DotNETconsole.csproj.FileListAbsolute.txt
@@ -14,8 +14,8 @@ D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Release\M98DotNETconsole.pdb
 D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Release\M98DotNETcore.dll
 D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Release\musicDriverInterface.dll
 D:\bootcamp\Source\Repos\M98DotNET\M98\bin\Release\M98DotNETcore.pdb
-D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Release\M98DotNETconsole.csprojAssemblyReference.cache
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Release\M98DotNETconsole.csproj.CoreCompileInputs.cache
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Release\M98DotNETconsole.csproj.CopyComplete
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Release\M98DotNETconsole.exe
 D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Release\M98DotNETconsole.pdb
+D:\bootcamp\Source\Repos\M98DotNET\M98\obj\Release\M98DotNETconsole.csproj.AssemblyReference.cache
diff --git a/M98/obj/Release/M98DotNETconsole.csprojAssemblyReference.cache b/M98/obj/Release/M98DotNETconsole.csprojAssemblyReference.cache
diff --git a/M98/obj/Release/M98DotNETconsole.exe b/M98/obj/Release/M98DotNETconsole.exe
diff --git a/M98/obj/Release/M98DotNETconsole.pdb b/M98/obj/Release/M98DotNETconsole.pdb
diff --git a/M98DotNET_NET5/M98DotNET_NET5.csproj b/M98DotNET_NET5/M98DotNET_NET5.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <AssemblyName>M98DotNET</AssemblyName>
+    <RootNamespace>M98DotNET</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\M98DotNETcore\atrb.cs" Link="atrb.cs" />
+    <Compile Include="..\M98DotNETcore\attrib.cs" Link="attrib.cs" />
+    <Compile Include="..\M98DotNETcore\command.cs" Link="command.cs" />
+    <Compile Include="..\M98DotNETcore\Common.cs" Link="Common.cs" />
+    <Compile Include="..\M98DotNETcore\compw.cs" Link="compw.cs" />
+    <Compile Include="..\M98DotNETcore\DEF.cs" Link="DEF.cs" />
+    <Compile Include="..\M98DotNETcore\flag.cs" Link="flag.cs" />
+    <Compile Include="..\M98DotNETcore\flgdat.cs" Link="flgdat.cs" />
+    <Compile Include="..\M98DotNETcore\grp_prm.cs" Link="grp_prm.cs" />
+    <Compile Include="..\M98DotNETcore\gWork.cs" Link="gWork.cs" />
+    <Compile Include="..\M98DotNETcore\iEncoding.cs" Link="iEncoding.cs" />
+    <Compile Include="..\M98DotNETcore\linedat.cs" Link="linedat.cs" />
+    <Compile Include="..\M98DotNETcore\M98.cs" Link="M98.cs" />
+    <Compile Include="..\M98DotNETcore\M98Exception.cs" Link="M98Exception.cs" />
+    <Compile Include="..\M98DotNETcore\MMLDAT.cs" Link="MMLDAT.cs" />
+    <Compile Include="..\M98DotNETcore\myEncoding.cs" Link="myEncoding.cs" />
+    <Compile Include="..\M98DotNETcore\repval.cs" Link="repval.cs" />
+    <Compile Include="..\M98DotNETcore\strpm.cs" Link="strpm.cs" />
+    <Compile Include="..\M98DotNETcore\STRPRM.cs" Link="STRPRM.cs" />
+    <Compile Include="..\M98DotNETcore\TONE.cs" Link="TONE.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="musicDriverInterface">
+      <HintPath>musicDriverInterface.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
diff --git a/M98DotNET_NET5/musicDriverInterface.dll b/M98DotNET_NET5/musicDriverInterface.dll
diff --git a/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.dll b/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.dll
diff --git a/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.pdb b/M98DotNETcore/bin/Debug/netstandard2.0/M98DotNETcore.pdb
diff --git a/M98DotNETcore/bin/Debug/netstandard2.0/musicDriverInterface.dll b/M98DotNETcore/bin/Debug/netstandard2.0/musicDriverInterface.dll
diff --git a/M98DotNETcore/bin/Release/netstandard2.0/M98DotNETcore.dll b/M98DotNETcore/bin/Release/netstandard2.0/M98DotNETcore.dll
diff --git a/M98DotNETcore/bin/Release/netstandard2.0/M98DotNETcore.pdb b/M98DotNETcore/bin/Release/netstandard2.0/M98DotNETcore.pdb
diff --git a/M98DotNETcore/bin/Release/netstandard2.0/musicDriverInterface.dll b/M98DotNETcore/bin/Release/netstandard2.0/musicDriverInterface.dll
diff --git a/M98DotNETcore/musicDriverInterface.dll b/M98DotNETcore/musicDriverInterface.dll
diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.assets.cache b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.assets.cache
diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.csproj.CoreCompileInputs.cache b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e2f02c8fdd67c4c64c6450e81416f189f8f6c116
+b42c53c4833ce6f05821bb398f7787276a68933a
diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.csproj.FileListAbsolute.txt b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.csproj.FileListAbsolute.txt
@@ -17,4 +17,4 @@ D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Debug\netstandard2.0\M98Dot
 D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Debug\netstandard2.0\M98DotNETcore.csproj.CopyComplete
 D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Debug\netstandard2.0\M98DotNETcore.dll
 D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Debug\netstandard2.0\M98DotNETcore.pdb
-D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Debug\netstandard2.0\M98DotNETcore.csprojAssemblyReference.cache
+D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Debug\netstandard2.0\M98DotNETcore.GeneratedMSBuildEditorConfig.editorconfig
diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.dll b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.dll
diff --git a/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.pdb b/M98DotNETcore/obj/Debug/netstandard2.0/M98DotNETcore.pdb
diff --git a/M98DotNETcore/obj/M98DotNETcore.csproj.nuget.dgspec.json b/M98DotNETcore/obj/M98DotNETcore.csproj.nuget.dgspec.json
@@ -14,11 +14,13 @@
         "outputPath": "D:\\bootcamp\\Source\\Repos\\M98DotNET\\M98DotNETcore\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "C:\\Microsoft\\Xamarin\\NuGet\\",
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
+          "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
           "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
         ],
         "configFilePaths": [
           "C:\\Users\\kuma\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -31,6 +33,7 @@
         },
         "frameworks": {
           "netstandard2.0": {
+            "targetAlias": "netstandard2.0",
             "projectReferences": {}
           }
         },
@@ -42,6 +45,7 @@
       },
       "frameworks": {
         "netstandard2.0": {
+          "targetAlias": "netstandard2.0",
           "dependencies": {
             "NETStandard.Library": {
               "suppressParent": "All",
@@ -60,7 +64,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/M98DotNETcore/obj/M98DotNETcore.csproj.nuget.g.props b/M98DotNETcore/obj/M98DotNETcore.csproj.nuget.g.props
@@ -5,12 +5,15 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\kuma\.nuget\packages\;C:\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\kuma\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.7.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.11.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
+    <SourceRoot Include="C:\Users\kuma\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
+    <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
   </ItemGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

diff --git a/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.assets.cache b/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.assets.cache
diff --git a/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.csproj.FileListAbsolute.txt b/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.csproj.FileListAbsolute.txt
@@ -17,4 +17,4 @@ D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Release\netstandard2.0\M98D
 D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Release\netstandard2.0\M98DotNETcore.csproj.CopyComplete
 D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Release\netstandard2.0\M98DotNETcore.dll
 D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Release\netstandard2.0\M98DotNETcore.pdb
-D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Release\netstandard2.0\M98DotNETcore.csprojAssemblyReference.cache
+D:\bootcamp\Source\Repos\M98DotNET\M98DotNETcore\obj\Release\netstandard2.0\M98DotNETcore.GeneratedMSBuildEditorConfig.editorconfig
diff --git a/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.dll b/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.dll
diff --git a/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.pdb b/M98DotNETcore/obj/Release/netstandard2.0/M98DotNETcore.pdb
diff --git a/M98DotNETcore/obj/project.assets.json b/M98DotNETcore/obj/project.assets.json
@@ -180,7 +180,8 @@
   },
   "packageFolders": {
     "C:\\Users\\kuma\\.nuget\\packages\\": {},
-    "C:\\Microsoft\\Xamarin\\NuGet\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
+    "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {},
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
   },
   "project": {
@@ -193,11 +194,13 @@
       "outputPath": "D:\\bootcamp\\Source\\Repos\\M98DotNET\\M98DotNETcore\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
-        "C:\\Microsoft\\Xamarin\\NuGet\\",
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
+        "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\",
         "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
       ],
       "configFilePaths": [
         "C:\\Users\\kuma\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
       ],
@@ -210,6 +213,7 @@
       },
       "frameworks": {
         "netstandard2.0": {
+          "targetAlias": "netstandard2.0",
           "projectReferences": {}
         }
       },
@@ -221,6 +225,7 @@
     },
     "frameworks": {
       "netstandard2.0": {
+        "targetAlias": "netstandard2.0",
         "dependencies": {
           "NETStandard.Library": {
             "suppressParent": "All",
@@ -239,7 +244,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.401\\RuntimeIdentifierGraph.json"
       }
     }
   }

diff --git a/M98DotNETcore/obj/project.nuget.cache b/M98DotNETcore/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "ssJvBGX74i0v88/eF3p98eMCJe6r1Zzn/h4KC6fY/GpcgG57PDUaSNm+gP3oSNHNYv/7nLNDPrhI8Ygq1KmwvA==",
+  "dgSpecHash": "YL5pejBYF0TKKGItuFIyOXLhUhRUfCTTckoogK7gxlHownjWj+Z8M+I01bQDVvYBeT1v51PSiZN/bfSNAvzLzg==",
   "success": true,
   "projectFilePath": "D:\\bootcamp\\Source\\Repos\\M98DotNET\\M98DotNETcore\\M98DotNETcore.csproj",
   "expectedPackageFiles": [
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		18be820bbd59db880ff1f8164dc2d4a416031a09
		ff1be724a291b0677c41b8776eb35b7af4c1391d
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e2f02c8fdd67c4c64c6450e81416f189f8f6c116
		b42c53c4833ce6f05821bb398f7787276a68933a