Skip to content

Commit f457524

Browse files
macmademacmade
committed
Migrated to SDK projects
1 parent dd46fd7 commit f457524

22 files changed

+900
-183
lines changed

‎ColorSet.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29025.244
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSetKit", "ColorSetKit\ColorSetKit.csproj", "{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorSetKit", "ColorSetKit\ColorSetKit.csproj", "{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSetKit-Test", "ColorSetKit-Test\ColorSetKit-Test.csproj", "{56A92618-CCFE-4313-90C1-EA63DFD154A0}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorSetKit-Test", "ColorSetKit-Test\ColorSetKit-Test.csproj", "{2212001F-B3EA-4496-9EC5-C4B54889FFB5}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
1717
{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
1818
{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
1919
{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{2212001F-B3EA-4496-9EC5-C4B54889FFB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{2212001F-B3EA-4496-9EC5-C4B54889FFB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{2212001F-B3EA-4496-9EC5-C4B54889FFB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{2212001F-B3EA-4496-9EC5-C4B54889FFB5}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE

‎ColorSetKit-Test/ColorSetKit-Test.csproj‎

Lines changed: 27 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{56A92618-CCFE-4313-90C1-EA63DFD154A0}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFrameworks>net462</TargetFrameworks>
105
<RootNamespace>ColorSetKit_Test</RootNamespace>
11-
<AssemblyName>ColorSetKit-Test</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
16-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
17-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
18-
<IsCodedUITest>False</IsCodedUITest>
19-
<TestProjectType>UnitTest</TestProjectType>
20-
<NuGetPackageImportStamp>
21-
</NuGetPackageImportStamp>
22-
<TargetFrameworkProfile />
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25-
<DebugSymbols>true</DebugSymbols>
26-
<DebugType>full</DebugType>
27-
<Optimize>false</Optimize>
28-
<OutputPath>..\Build\Debug\</OutputPath>
29-
<DefineConstants>DEBUG;TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
<Prefer32Bit>false</Prefer32Bit>
33-
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
35-
<DebugType>pdbonly</DebugType>
36-
<Optimize>true</Optimize>
37-
<OutputPath>..\Build\Release\</OutputPath>
38-
<DefineConstants>TRACE</DefineConstants>
39-
<ErrorReport>prompt</ErrorReport>
40-
<WarningLevel>4</WarningLevel>
41-
<Prefer32Bit>false</Prefer32Bit>
6+
<IsPackable>false</IsPackable>
7+
<UseWPF>true</UseWPF>
428
</PropertyGroup>
9+
4310
<ItemGroup>
44-
<Reference Include="PresentationCore" />
45-
<Reference Include="System" />
46-
<Reference Include="System.Core" />
47-
<Reference Include="System.Xaml" />
48-
<Reference Include="WindowsBase" />
11+
<None Remove="Info.plist" />
12+
<None Remove="Test.swift" />
4913
</ItemGroup>
14+
5015
<ItemGroup>
51-
<Compile Include="Test.cs" />
52-
<Compile Include="Properties\AssemblyInfo.cs" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
17+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
18+
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
19+
<PackageReference Include="coverlet.collector" Version="3.1.0">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
5323
</ItemGroup>
24+
5425
<ItemGroup>
55-
<ProjectReference Include="..\ColorSetKit\ColorSetKit.csproj">
56-
<Project>{e3bf32cb-99e2-4331-afb6-9281d79e63bc}</Project>
57-
<Name>ColorSetKit</Name>
58-
</ProjectReference>
26+
<ProjectReference Include="..\ColorSetKit\ColorSetKit.csproj" />
5927
</ItemGroup>
28+
6029
<ItemGroup>
61-
<PackageReference Include="MSTest.TestAdapter">
62-
<Version>1.3.2</Version>
63-
</PackageReference>
64-
<PackageReference Include="MSTest.TestFramework">
65-
<Version>1.3.2</Version>
66-
</PackageReference>
30+
<None Update="Colors-XML.colorset">
31+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
32+
</None>
33+
<None Update="Colors.colorset">
34+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
35+
</None>
6736
</ItemGroup>
68-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
69-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
70-
<PropertyGroup>
71-
<PostBuildEvent>copy "$(ProjectDir)Colors.colorset" "$(TargetDir)Colors.colorset"
72-
copy "$(ProjectDir)Colors-XML.colorset" "$(TargetDir)Colors-XML.colorset"</PostBuildEvent>
73-
</PropertyGroup>
74-
</Project>
37+
38+
</Project>

‎ColorSetKit-Test/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎ColorSetKit-Test/obj/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎ColorSetKit-Test/obj/ColorSetKit-Test.csproj.nuget.dgspec.json‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{
2+
"format": 1,
3+
"restore": {
4+
"D:\\DDNA\\ColorSet\\ColorSetKit-Test\\ColorSetKit-Test.csproj": {}
5+
},
6+
"projects": {
7+
"D:\\DDNA\\ColorSet\\ColorSetKit-Test\\ColorSetKit-Test.csproj": {
8+
"version": "1.0.0",
9+
"restore": {
10+
"projectUniqueName": "D:\\DDNA\\ColorSet\\ColorSetKit-Test\\ColorSetKit-Test.csproj",
11+
"projectName": "ColorSetKit-Test",
12+
"projectPath": "D:\\DDNA\\ColorSet\\ColorSetKit-Test\\ColorSetKit-Test.csproj",
13+
"packagesPath": "C:\\Users\\Macmade\\.nuget\\packages\\",
14+
"outputPath": "D:\\DDNA\\ColorSet\\ColorSetKit-Test\\obj\\",
15+
"projectStyle": "PackageReference",
16+
"crossTargeting": true,
17+
"fallbackFolders": [
18+
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
19+
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
20+
],
21+
"configFilePaths": [
22+
"C:\\Users\\Macmade\\AppData\\Roaming\\NuGet\\NuGet.Config",
23+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
24+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
25+
],
26+
"originalTargetFrameworks": [
27+
"net462"
28+
],
29+
"sources": {
30+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
31+
"https://api.nuget.org/v3/index.json": {}
32+
},
33+
"frameworks": {
34+
"net462": {
35+
"targetAlias": "net462",
36+
"projectReferences": {
37+
"D:\\DDNA\\ColorSet\\ColorSetKit\\ColorSetKit.csproj": {
38+
"projectPath": "D:\\DDNA\\ColorSet\\ColorSetKit\\ColorSetKit.csproj"
39+
}
40+
}
41+
}
42+
},
43+
"warningProperties": {
44+
"warnAsError": [
45+
"NU1605"
46+
]
47+
}
48+
},
49+
"frameworks": {
50+
"net462": {
51+
"targetAlias": "net462",
52+
"dependencies": {
53+
"MSTest.TestAdapter": {
54+
"target": "Package",
55+
"version": "[2.2.7, )"
56+
},
57+
"MSTest.TestFramework": {
58+
"target": "Package",
59+
"version": "[2.2.7, )"
60+
},
61+
"Microsoft.NET.Test.Sdk": {
62+
"target": "Package",
63+
"version": "[16.11.0, )"
64+
},
65+
"coverlet.collector": {
66+
"include": "Runtime, Build, Native, ContentFiles, Analyzers, BuildTransitive",
67+
"suppressParent": "All",
68+
"target": "Package",
69+
"version": "[3.1.0, )"
70+
}
71+
},
72+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.401\\RuntimeIdentifierGraph.json"
73+
}
74+
}
75+
},
76+
"D:\\DDNA\\ColorSet\\ColorSetKit\\ColorSetKit.csproj": {
77+
"version": "1.0.0",
78+
"restore": {
79+
"projectUniqueName": "D:\\DDNA\\ColorSet\\ColorSetKit\\ColorSetKit.csproj",
80+
"projectName": "ColorSetKit",
81+
"projectPath": "D:\\DDNA\\ColorSet\\ColorSetKit\\ColorSetKit.csproj",
82+
"packagesPath": "C:\\Users\\Macmade\\.nuget\\packages\\",
83+
"outputPath": "D:\\DDNA\\ColorSet\\ColorSetKit\\obj\\",
84+
"projectStyle": "PackageReference",
85+
"crossTargeting": true,
86+
"fallbackFolders": [
87+
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
88+
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
89+
],
90+
"configFilePaths": [
91+
"C:\\Users\\Macmade\\AppData\\Roaming\\NuGet\\NuGet.Config",
92+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
93+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
94+
],
95+
"originalTargetFrameworks": [
96+
"net462"
97+
],
98+
"sources": {
99+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
100+
"https://api.nuget.org/v3/index.json": {}
101+
},
102+
"frameworks": {
103+
"net462": {
104+
"targetAlias": "net462",
105+
"projectReferences": {}
106+
}
107+
},
108+
"warningProperties": {
109+
"warnAsError": [
110+
"NU1605"
111+
]
112+
}
113+
},
114+
"frameworks": {
115+
"net462": {
116+
"targetAlias": "net462",
117+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.401\\RuntimeIdentifierGraph.json"
118+
}
119+
}
120+
}
121+
}
122+
}

‎ColorSetKit-Test/obj/ColorSetKit-Test.csproj.nuget.g.props‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
4+
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5+
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6+
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7+
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
8+
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Macmade\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
9+
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10+
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.11.0</NuGetToolVersion>
11+
</PropertyGroup>
12+
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
13+
<SourceRoot Include="C:\Users\Macmade\.nuget\packages\" />
14+
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
15+
<SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
16+
</ItemGroup>
17+
<PropertyGroup>
18+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
19+
</PropertyGroup>
20+
<ImportGroup Condition=" '$(TargetFramework)' == '' AND '$(ExcludeRestorePackageImports)' != 'true' ">
21+
<Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\16.11.0\buildMultiTargeting\Microsoft.NET.Test.Sdk.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\16.11.0\buildMultiTargeting\Microsoft.NET.Test.Sdk.props')" />
22+
</ImportGroup>
23+
<ImportGroup Condition=" '$(TargetFramework)' == 'net462' AND '$(ExcludeRestorePackageImports)' != 'true' ">
24+
<Import Project="$(NuGetPackageRoot)mstest.testadapter\2.2.7\build\net45\MSTest.TestAdapter.props" Condition="Exists('$(NuGetPackageRoot)mstest.testadapter\2.2.7\build\net45\MSTest.TestAdapter.props')" />
25+
<Import Project="$(NuGetPackageRoot)microsoft.codecoverage\16.11.0\build\netstandard1.0\Microsoft.CodeCoverage.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codecoverage\16.11.0\build\netstandard1.0\Microsoft.CodeCoverage.props')" />
26+
<Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\16.11.0\build\net45\Microsoft.NET.Test.Sdk.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\16.11.0\build\net45\Microsoft.NET.Test.Sdk.props')" />
27+
</ImportGroup>
28+
</Project>

‎ColorSetKit-Test/obj/ColorSetKit-Test.csproj.nuget.g.targets‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
</PropertyGroup>
6+
<ImportGroup Condition=" '$(TargetFramework)' == 'net462' AND '$(ExcludeRestorePackageImports)' != 'true' ">
7+
<Import Project="$(NuGetPackageRoot)mstest.testadapter\2.2.7\build\net45\MSTest.TestAdapter.targets" Condition="Exists('$(NuGetPackageRoot)mstest.testadapter\2.2.7\build\net45\MSTest.TestAdapter.targets')" />
8+
<Import Project="$(NuGetPackageRoot)microsoft.codecoverage\16.11.0\build\netstandard1.0\Microsoft.CodeCoverage.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codecoverage\16.11.0\build\netstandard1.0\Microsoft.CodeCoverage.targets')" />
9+
<Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\16.11.0\build\net45\Microsoft.NET.Test.Sdk.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\16.11.0\build\net45\Microsoft.NET.Test.Sdk.targets')" />
10+
<Import Project="$(NuGetPackageRoot)coverlet.collector\3.1.0\build\netstandard1.0\coverlet.collector.targets" Condition="Exists('$(NuGetPackageRoot)coverlet.collector\3.1.0\build\netstandard1.0\coverlet.collector.targets')" />
11+
</ImportGroup>
12+
</Project>

‎ColorSetKit-Test/obj/Debug/net462/.NETFramework,Version=v4.6.2.AssemblyAttributes.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// <autogenerated />
2+
using System;
3+
using System.Reflection;
4+
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.2", FrameworkDisplayName = ".NET Framework 4.6.2")]

‎ColorSetKit-Test/obj/Debug/net462/ColorSetKit-Test.AssemblyInfo.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by a tool.
4+
// Runtime Version:4.0.30319.42000
5+
//
6+
// Changes to this file may cause incorrect behavior and will be lost if
7+
// the code is regenerated.
8+
// </auto-generated>
9+
//------------------------------------------------------------------------------
10+
11+
using System;
12+
using System.Reflection;
13+
14+
[assembly: System.Reflection.AssemblyCompanyAttribute("ColorSetKit-Test")]
15+
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
16+
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
17+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
18+
[assembly: System.Reflection.AssemblyProductAttribute("ColorSetKit-Test")]
19+
[assembly: System.Reflection.AssemblyTitleAttribute("ColorSetKit-Test")]
20+
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
21+
22+
// Generated by the MSBuild WriteCodeFragment class.
23+

‎ColorSetKit-Test/obj/Debug/net462/ColorSetKit-Test.AssemblyInfoInputs.cache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e6063866783081a1cd1fbe407e5f95e56b1b8349

0 commit comments

Comments
 (0)