diff --git a/Localization.sln b/Localization.sln index 276c09e515..695e03c6d4 100644 --- a/Localization.sln +++ b/Localization.sln @@ -1,43 +1,38 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26127.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FB313677-BAB3-4E49-8CDB-4FA4A9564767}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Localization", "src\Microsoft.Extensions.Localization\Microsoft.Extensions.Localization.xproj", "{29743CFF-120E-40EB-9B89-5818425946FA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Localization", "src\Microsoft.Extensions.Localization\Microsoft.Extensions.Localization.csproj", "{29743CFF-120E-40EB-9B89-5818425946FA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization", "src\Microsoft.AspNetCore.Localization\Microsoft.AspNetCore.Localization.xproj", "{23E3BC23-3464-4D9B-BF78-02CB2182BEF0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization", "src\Microsoft.AspNetCore.Localization\Microsoft.AspNetCore.Localization.csproj", "{23E3BC23-3464-4D9B-BF78-02CB2182BEF0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Localization.Abstractions", "src\Microsoft.Extensions.Localization.Abstractions\Microsoft.Extensions.Localization.Abstractions.xproj", "{A1FCF259-70F6-4605-AA2D-E4B356BE771A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Localization.Abstractions", "src\Microsoft.Extensions.Localization.Abstractions\Microsoft.Extensions.Localization.Abstractions.csproj", "{A1FCF259-70F6-4605-AA2D-E4B356BE771A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{79878809-8D1C-4BD4-BA99-F1F13FF96FD8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LocalizationSample", "samples\LocalizationSample\LocalizationSample.xproj", "{55D9501F-15B9-4339-A0AB-6082850E5FCE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizationSample", "samples\LocalizationSample\LocalizationSample.csproj", "{55D9501F-15B9-4339-A0AB-6082850E5FCE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5E7E7712-E3E3-4AD5-9B89-7FC140359FF1}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Globalization.CultureInfoCache", "src\Microsoft.Extensions.Globalization.CultureInfoCache\Microsoft.Extensions.Globalization.CultureInfoCache.xproj", "{F3988D3A-A4C8-4FD7-BAFE-13E0D0A1659A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Globalization.CultureInfoCache", "src\Microsoft.Extensions.Globalization.CultureInfoCache\Microsoft.Extensions.Globalization.CultureInfoCache.csproj", "{F3988D3A-A4C8-4FD7-BAFE-13E0D0A1659A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B723DB83-A670-4BCB-95FB-195361331AD2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Localization.Tests", "test\Microsoft.Extensions.Localization.Tests\Microsoft.Extensions.Localization.Tests.xproj", "{287AD58D-DF34-4F16-8616-FD78FA1CADF9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Localization.Tests", "test\Microsoft.Extensions.Localization.Tests\Microsoft.Extensions.Localization.Tests.csproj", "{287AD58D-DF34-4F16-8616-FD78FA1CADF9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization.Tests", "test\Microsoft.AspNetCore.Localization.Tests\Microsoft.AspNetCore.Localization.Tests.xproj", "{19A2A931-5C60-47A0-816A-0DC9C4CE5736}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.Tests", "test\Microsoft.AspNetCore.Localization.Tests\Microsoft.AspNetCore.Localization.Tests.csproj", "{19A2A931-5C60-47A0-816A-0DC9C4CE5736}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LocalizationWebsite", "test\LocalizationWebsite\LocalizationWebsite.xproj", "{EF6C7431-2FB8-4396-8947-F50F31689AF4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizationWebsite", "test\LocalizationWebsite\LocalizationWebsite.csproj", "{EF6C7431-2FB8-4396-8947-F50F31689AF4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization.FunctionalTests", "test\Microsoft.AspNetCore.Localization.FunctionalTests\Microsoft.AspNetCore.Localization.FunctionalTests.xproj", "{B1B441BA-3AC8-49F8-850D-E5A178E77DE2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.FunctionalTests", "test\Microsoft.AspNetCore.Localization.FunctionalTests\Microsoft.AspNetCore.Localization.FunctionalTests.csproj", "{B1B441BA-3AC8-49F8-850D-E5A178E77DE2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ResourcesClassLibraryWithAttribute", "test\ResourcesClassLibraryWithAttribute\ResourcesClassLibraryWithAttribute.xproj", "{F27639B9-913E-43AF-9D64-BBD98D9A420A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourcesClassLibraryWithAttribute", "test\ResourcesClassLibraryWithAttribute\ResourcesClassLibraryWithAttribute.csproj", "{F27639B9-913E-43AF-9D64-BBD98D9A420A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ResourcesClassLibraryNoAttribute", "test\ResourcesClassLibraryNoAttribute\ResourcesClassLibraryNoAttribute.xproj", "{34740578-D5B5-4FB4-AFD4-5E87B5443E20}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourcesClassLibraryNoAttribute", "test\ResourcesClassLibraryNoAttribute\ResourcesClassLibraryNoAttribute.csproj", "{34740578-D5B5-4FB4-AFD4-5E87B5443E20}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization.Routing", "src\Microsoft.AspNetCore.Localization.Routing\Microsoft.AspNetCore.Localization.Routing.xproj", "{E1B8DA18-7885-40ED-94ED-881BB0804F23}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.Routing", "src\Microsoft.AspNetCore.Localization.Routing\Microsoft.AspNetCore.Localization.Routing.csproj", "{E1B8DA18-7885-40ED-94ED-881BB0804F23}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization.Routing.Tests", "test\Microsoft.AspNetCore.Localization.Routing.Tests\Microsoft.AspNetCore.Localization.Routing.Tests.xproj", "{375B000B-5DC0-4D16-AC0C-A5432D8E7581}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.Routing.Tests", "test\Microsoft.AspNetCore.Localization.Routing.Tests\Microsoft.AspNetCore.Localization.Routing.Tests.csproj", "{375B000B-5DC0-4D16-AC0C-A5432D8E7581}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGet.config b/NuGet.config index 826a1f9035..8e65695611 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,8 @@ - + + - \ No newline at end of file + diff --git a/appveyor.yml b/appveyor.yml index be95b88d6f..13c0650228 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,4 +10,5 @@ build_script: - build.cmd --quiet verify clone_depth: 1 test: off -deploy: off \ No newline at end of file +deploy: off +os: Visual Studio 2017 RC diff --git a/build.ps1 b/build.ps1 index 8f2f99691a..0605b59c01 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index 4fd7ede788..07997d6c83 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi diff --git a/tools/Key.snk b/build/Key.snk similarity index 100% rename from tools/Key.snk rename to build/Key.snk diff --git a/build/common.props b/build/common.props new file mode 100644 index 0000000000..e9df5204ba --- /dev/null +++ b/build/common.props @@ -0,0 +1,23 @@ + + + + + https://github.com/aspnet/Localization + git + $(MSBuildThisFileDirectory)Key.snk + true + true + 1.2.0-* + 1.6.2-* + $(VersionSuffix)-$(BuildNumber) + + + + + + + + + + + diff --git a/global.json b/global.json deleted file mode 100644 index 0ad1995dd2..0000000000 --- a/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "projects": [ - "src" - ], - "sdk": { - "version": "1.0.0-preview2-1-003180" - } -} \ No newline at end of file diff --git a/samples/LocalizationSample/LocalizationSample.csproj b/samples/LocalizationSample/LocalizationSample.csproj new file mode 100644 index 0000000000..a77f8d48a3 --- /dev/null +++ b/samples/LocalizationSample/LocalizationSample.csproj @@ -0,0 +1,18 @@ + + + + net451;netcoreapp1.1 + + win7-x64 + Exe + + + + + + + + + + + diff --git a/samples/LocalizationSample/LocalizationSample.xproj b/samples/LocalizationSample/LocalizationSample.xproj deleted file mode 100644 index 6d89ca66e5..0000000000 --- a/samples/LocalizationSample/LocalizationSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 55d9501f-15b9-4339-a0ab-6082850e5fce - .\obj - .\bin\ - - - 2.0 - 31454 - - - \ No newline at end of file diff --git a/samples/LocalizationSample/project.json b/samples/LocalizationSample/project.json deleted file mode 100644 index 86337a8672..0000000000 --- a/samples/LocalizationSample/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": "1.1.0-*", - "dependencies": { - "Microsoft.AspNetCore.Localization": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Localization": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj new file mode 100644 index 0000000000..17f81580ba --- /dev/null +++ b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj @@ -0,0 +1,20 @@ + + + + + + Microsoft ASP.NET Core + Provides a request culture provider which gets culture and ui-culture from request's route data. + net451;netstandard1.3 + $(NoWarn);CS1591 + true + aspnetcore;localization + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.xproj b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.xproj deleted file mode 100644 index d992283c12..0000000000 --- a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e1b8da18-7885-40ed-94ed-881bb0804f23 - Microsoft.AspNetCore.Localization.Routing - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Localization.Routing/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Localization.Routing/Properties/AssemblyInfo.cs deleted file mode 100644 index 76feceeff0..0000000000 --- a/src/Microsoft.AspNetCore.Localization.Routing/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.Localization.Routing/project.json b/src/Microsoft.AspNetCore.Localization.Routing/project.json deleted file mode 100644 index a542063abd..0000000000 --- a/src/Microsoft.AspNetCore.Localization.Routing/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "Provides a request culture provider which gets culture and ui-culture from request's route data.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/localization" - }, - "tags": [ - "aspnetcore", - "localization" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Localization": { - "target": "project" - }, - "Microsoft.AspNetCore.Routing.Abstractions": "1.2.0-*", - "Microsoft.Extensions.TaskCache.Sources": { - "type": "build", - "version": "1.2.0-*" - } - }, - "frameworks": { - "net451": {}, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj new file mode 100644 index 0000000000..0c58e73438 --- /dev/null +++ b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj @@ -0,0 +1,22 @@ + + + + + + Microsoft ASP.NET Core + ASP.NET Core middleware for automatically applying culture information to HTTP requests. Culture information can be specified in the HTTP header, query string, cookie, or custom source. + net451;netstandard1.3 + $(NoWarn);CS1591 + true + aspnetcore;localization + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj deleted file mode 100644 index 97ef051160..0000000000 --- a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 23e3bc23-3464-4d9b-bf78-02cb2182bef0 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Localization/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Localization/Properties/AssemblyInfo.cs deleted file mode 100644 index 76feceeff0..0000000000 --- a/src/Microsoft.AspNetCore.Localization/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.Localization/project.json b/src/Microsoft.AspNetCore.Localization/project.json deleted file mode 100644 index 0a2669f87c..0000000000 --- a/src/Microsoft.AspNetCore.Localization/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "ASP.NET Core middleware for automatically applying culture information to HTTP requests. Culture information can be specified in the HTTP header, query string, cookie, or custom source.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/localization" - }, - "tags": [ - "aspnetcore", - "localization" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*", - "Microsoft.Extensions.Globalization.CultureInfoCache": { - "target": "project" - }, - "Microsoft.Extensions.Localization.Abstractions": { - "target": "project" - }, - "Microsoft.Extensions.Options": "1.2.0-*", - "Microsoft.Extensions.TaskCache.Sources": { - "type": "build", - "version": "1.2.0-*" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.csproj b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.csproj new file mode 100644 index 0000000000..7e77a57413 --- /dev/null +++ b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.csproj @@ -0,0 +1,14 @@ + + + + + + Microsoft .NET Extensions + Provides cached instances of CultureInfo using a generated list of known culture names for use in scenarios where unbounded CultureInfo creation is undesirable. + netstandard1.1 + $(NoWarn);CS1591 + true + globalization;localization + + + diff --git a/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj deleted file mode 100644 index 79ad6911c2..0000000000 --- a/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f3988d3a-a4c8-4fd7-bafe-13e0d0a1659a - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs deleted file mode 100644 index 8d8d88195c..0000000000 --- a/src/Microsoft.Extensions.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] diff --git a/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json b/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json deleted file mode 100644 index 80eae828e5..0000000000 --- a/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "Provides cached instances of CultureInfo using a generated list of known culture names for use in scenarios where unbounded CultureInfo creation is undesirable.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/localization" - }, - "tags": [ - "globalization", - "localization" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "NETStandard.Library": "1.6.2-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj new file mode 100644 index 0000000000..a6f2e6a71d --- /dev/null +++ b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj @@ -0,0 +1,21 @@ + + + + + + Microsoft .NET Extensions + Abstractions of application localization services. +Commonly used types: +Microsoft.Extensions.Localization.IStringLocalizer +Microsoft.Extensions.Localization.IStringLocalizer<T> + netstandard1.0 + $(NoWarn);CS1591 + true + localization + + + + + + + diff --git a/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj deleted file mode 100644 index fd0f9386f9..0000000000 --- a/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a1fcf259-70f6-4605-aa2d-e4b356be771a - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Localization.Abstractions/Properties/AssemblyInfo.cs deleted file mode 100644 index 8d8d88195c..0000000000 --- a/src/Microsoft.Extensions.Localization.Abstractions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] diff --git a/src/Microsoft.Extensions.Localization.Abstractions/project.json b/src/Microsoft.Extensions.Localization.Abstractions/project.json deleted file mode 100644 index c76356e82b..0000000000 --- a/src/Microsoft.Extensions.Localization.Abstractions/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "Abstractions of application localization services.\r\nCommonly used types:\r\nMicrosoft.Extensions.Localization.IStringLocalizer\r\nMicrosoft.Extensions.Localization.IStringLocalizer", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/localization" - }, - "tags": [ - "localization" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "frameworks": { - "netstandard1.0": { - "dependencies": { - "Microsoft.CSharp": "4.4.0-*", - "NETStandard.Library": "1.6.2-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj new file mode 100644 index 0000000000..11d971a8f9 --- /dev/null +++ b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj @@ -0,0 +1,24 @@ + + + + + + Microsoft .NET Extensions + Application localization services and default implementation based on ResourceManager to load localized assembly resources. + net451;netstandard1.3 + $(NoWarn);CS1591 + true + localization + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj deleted file mode 100644 index cd5e08309e..0000000000 --- a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 29743cff-120e-40eb-9b89-5818425946fa - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs index a1fb7e906a..3e297b801e 100644 --- a/src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs @@ -1,13 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Localization.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] diff --git a/src/Microsoft.Extensions.Localization/project.json b/src/Microsoft.Extensions.Localization/project.json deleted file mode 100644 index ae565361d3..0000000000 --- a/src/Microsoft.Extensions.Localization/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "Application localization services and default implementation based on ResourceManager to load localized assembly resources.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/localization" - }, - "tags": [ - "localization" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.2.0-*", - "Microsoft.Extensions.Localization.Abstractions": { - "target": "project" - }, - "Microsoft.Extensions.Options": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.3": { - "dependencies": { - "System.Resources.Reader": "4.4.0-*" - } - } - } -} \ No newline at end of file diff --git a/test/LocalizationWebsite/.notest b/test/LocalizationWebsite/.notest new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/LocalizationWebsite/LocalizationWebsite.csproj b/test/LocalizationWebsite/LocalizationWebsite.csproj new file mode 100644 index 0000000000..320d84d2e3 --- /dev/null +++ b/test/LocalizationWebsite/LocalizationWebsite.csproj @@ -0,0 +1,23 @@ + + + + + + netcoreapp1.1;net451 + + win7-x64 + Exe + + + + + + + + + + + + + + diff --git a/test/LocalizationWebsite/LocalizationWebsite.xproj b/test/LocalizationWebsite/LocalizationWebsite.xproj deleted file mode 100644 index 40b2907ba6..0000000000 --- a/test/LocalizationWebsite/LocalizationWebsite.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ef6c7431-2fb8-4396-8947-f50f31689af4 - .\obj - .\bin\ - - - 2.0 - 5198 - - - \ No newline at end of file diff --git a/test/LocalizationWebsite/project.json b/test/LocalizationWebsite/project.json deleted file mode 100644 index 3427ac7f07..0000000000 --- a/test/LocalizationWebsite/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.1.0-*", - "buildOptions": { - "warningsAsErrors": true, - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.AspNetCore.Localization": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Localization": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*", - "ResourcesClassLibraryNoAttribute": "1.0.0-*", - "ResourcesClassLibraryWithAttribute": "1.0.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj new file mode 100644 index 0000000000..24a0d564c2 --- /dev/null +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj @@ -0,0 +1,24 @@ + + + + + + netcoreapp1.1 + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj deleted file mode 100644 index ee713bfb31..0000000000 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b1b441ba-3ac8-49f8-850d-e5a178e77de2 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs index dae7cebb21..3a5b8acd21 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests while (di.Parent != null) { - var globalJsonPath = Path.Combine(di.FullName, "global.json"); + var globalJsonPath = Path.Combine(di.FullName, "version.props"); if (File.Exists(globalJsonPath)) { diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json deleted file mode 100644 index 1850e8c907..0000000000 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Localization": "1.2.0-*", - "Microsoft.AspNetCore.Server.IntegrationTesting": "0.3.0-*", - "Microsoft.Extensions.Logging": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj new file mode 100644 index 0000000000..43f0ecabb8 --- /dev/null +++ b/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj @@ -0,0 +1,22 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.xproj b/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.xproj deleted file mode 100644 index 57ded6b43e..0000000000 --- a/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 375b000b-5dc0-4d16-ac0c-a5432d8e7581 - Microsoft.AspNetCore.Localization.Routing.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Localization.Routing.Tests/project.json b/test/Microsoft.AspNetCore.Localization.Routing.Tests/project.json deleted file mode 100644 index acd4672b7b..0000000000 --- a/test/Microsoft.AspNetCore.Localization.Routing.Tests/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Localization.Routing": "1.2.0-*", - "Microsoft.AspNetCore.Routing": "1.2.0-*", - "Microsoft.AspNetCore.TestHost": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj new file mode 100644 index 0000000000..0e1928e720 --- /dev/null +++ b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj @@ -0,0 +1,21 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj deleted file mode 100644 index ba71139219..0000000000 --- a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 19a2a931-5c60-47a0-816a-0dc9c4ce5736 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Localization.Tests/project.json b/test/Microsoft.AspNetCore.Localization.Tests/project.json deleted file mode 100644 index 78b9596bd9..0000000000 --- a/test/Microsoft.AspNetCore.Localization.Tests/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Localization": "1.2.0-*", - "Microsoft.AspNetCore.TestHost": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj new file mode 100644 index 0000000000..27d9c31bac --- /dev/null +++ b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj @@ -0,0 +1,27 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj deleted file mode 100644 index 3d30f783c7..0000000000 --- a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 287ad58d-df34-4f16-8616-fd78fa1cadf9 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Localization.Tests/project.json b/test/Microsoft.Extensions.Localization.Tests/project.json deleted file mode 100644 index b4804b1083..0000000000 --- a/test/Microsoft.Extensions.Localization.Tests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.DependencyInjection": "1.2.0-*", - "Microsoft.Extensions.Localization": "1.2.0-*", - "Moq": "4.6.36-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - }, - "System.Diagnostics.TraceSource": "4.4.0-*", - "System.Resources.Writer": "4.4.0-*" - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/ResourcesClassLibraryNoAttribute/.notest b/test/ResourcesClassLibraryNoAttribute/.notest new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/ResourcesClassLibraryNoAttribute/Properties/AssemblyInfo.cs b/test/ResourcesClassLibraryNoAttribute/Properties/AssemblyInfo.cs deleted file mode 100644 index b47aa1a1fd..0000000000 --- a/test/ResourcesClassLibraryNoAttribute/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ResourcesClassLibraryNoAttribute")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("34740578-d5b5-4fb4-afd4-5e87b5443e20")] diff --git a/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj b/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj new file mode 100644 index 0000000000..d53e4d20d9 --- /dev/null +++ b/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj @@ -0,0 +1,9 @@ + + + + + + net451;netstandard1.6 + + + diff --git a/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.xproj b/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.xproj deleted file mode 100644 index c0043ca3de..0000000000 --- a/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 34740578-d5b5-4fb4-afd4-5e87b5443e20 - ResourcesClassLibraryNoAttribute - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/test/ResourcesClassLibraryNoAttribute/project.json b/test/ResourcesClassLibraryNoAttribute/project.json deleted file mode 100644 index 2c4c14a349..0000000000 --- a/test/ResourcesClassLibraryNoAttribute/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} \ No newline at end of file diff --git a/test/ResourcesClassLibraryWithAttribute/.notest b/test/ResourcesClassLibraryWithAttribute/.notest new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/ResourcesClassLibraryWithAttribute/AssemblyInfo.cs b/test/ResourcesClassLibraryWithAttribute/AssemblyInfo.cs new file mode 100644 index 0000000000..f770fdb4db --- /dev/null +++ b/test/ResourcesClassLibraryWithAttribute/AssemblyInfo.cs @@ -0,0 +1,7 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; +using Microsoft.Extensions.Localization; + +[assembly: ResourceLocation("ResourceFolder")] \ No newline at end of file diff --git a/test/ResourcesClassLibraryWithAttribute/Properties/AssemblyInfo.cs b/test/ResourcesClassLibraryWithAttribute/Properties/AssemblyInfo.cs deleted file mode 100644 index 143b120c3a..0000000000 --- a/test/ResourcesClassLibraryWithAttribute/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Microsoft.Extensions.Localization; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ResourcesClassLibraryWithAttribute")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f27639b9-913e-43af-9d64-bbd98d9a420a")] -[assembly: ResourceLocation("ResourceFolder")] diff --git a/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj b/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj new file mode 100644 index 0000000000..66af7b18af --- /dev/null +++ b/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj @@ -0,0 +1,13 @@ + + + + + + net451;netstandard1.6 + + + + + + + diff --git a/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.xproj b/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.xproj deleted file mode 100644 index 2362f9de56..0000000000 --- a/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f27639b9-913e-43af-9d64-bbd98d9a420a - ResourcesClassLibraryWithAttribute - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/test/ResourcesClassLibraryWithAttribute/project.json b/test/ResourcesClassLibraryWithAttribute/project.json deleted file mode 100644 index ff41a9fc17..0000000000 --- a/test/ResourcesClassLibraryWithAttribute/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.Extensions.Localization": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} \ No newline at end of file diff --git a/version.props b/version.props new file mode 100644 index 0000000000..17fd5ac36d --- /dev/null +++ b/version.props @@ -0,0 +1,7 @@ + + + + 1.2.0 + preview1 + +