diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index b70d370dc099744a382ec33c8eb9dc3bff927c86..ceaad8c6706ffd74fdeae52c96295e9a3431eaa7 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -22,33 +22,7 @@ "Exclusions": { "ASSEMBLY_DESCRIPTION": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions." }, "ASSEMBLY_PRODUCT": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", @@ -56,204 +30,38 @@ }, "NEUTRAL_RESOURCES_LANGUAGE": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions." }, "SERVICING_ATTRIBUTE": { - "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions." }, "WRONG_PUBLICKEYTOKEN": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Collections.Immutable.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Reflection.Metadata.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." }, "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Collections.Immutable.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Reflection.Metadata.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." }, "ASSEMBLY_FILE_VERSION_MISMATCH": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Collections.Immutable.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Reflection.Metadata.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." }, "ASSEMBLY_VERSION_MISMATCH": { "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.", "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Collections.Immutable.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/System.Reflection.Metadata.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/cs/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/de/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/es/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/fr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/it/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ja/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ko/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pl/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/ru/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/tr/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": "This assembly is not owned by us and does not follow our conventions.", - "tools/netcoreapp3.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": "This assembly is not owned by us and does not follow our conventions." + "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions." }, "BUILD_ITEMS_FRAMEWORK": { "*": "Razor SDK does not contain any dependencies or binaries and consequently does not have a dependency group." diff --git a/build/MPack.targets b/build/MPack.targets index 24c158d8a2fefabd93eafb0bbd00b40ea9f8ed57..e00b58a968fff26171cd7b2598f4979c64914c3c 100644 --- a/build/MPack.targets +++ b/build/MPack.targets @@ -7,9 +7,9 @@ <MPackArtifactCategory>shipoob</MPackArtifactCategory> <MPackIntermediateOutputPath>$(IntermediateDir)mpack\</MPackIntermediateOutputPath> - <AddinOutputPath>$(AddinDirectory)bin\$(Configuration)\net461\</AddinOutputPath> + <AddinOutputPath>$(AddinDirectory)bin\$(Configuration)\net472\</AddinOutputPath> <LanguageServiceName>Microsoft.VisualStudio.Mac.LanguageServices.Razor</LanguageServiceName> - <LanguageServiceOutputPath>$(RepositoryRoot)src\$(LanguageServiceName)\bin\$(Configuration)\net461\</LanguageServiceOutputPath> + <LanguageServiceOutputPath>$(RepositoryRoot)src\$(LanguageServiceName)\bin\$(Configuration)\net472\</LanguageServiceOutputPath> <MPackName>$(AddinName)_$(AddinVersion)</MPackName> <MPackFileName>$(MPackName).mpack</MPackFileName> <MPackOutputPath>$(BuildDir)$(MPackFileName)</MPackOutputPath> @@ -72,9 +72,9 @@ </ItemGroup> <ItemGroup> - <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" /> - <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" /> - <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" /> + <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" /> + <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" /> + <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" /> <LanguageServiceAssembly Include="$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)" Condition="Exists('$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)')" /> <LanguageServiceAssembly Include="%(LanguageServiceExtensionAssembly.Identity)" /> <LanguageServicePDB Include="%(LanguageServiceAssembly.RootDir)%(Directory)%(FileName).pdb" Condition="Exists('%(LanguageServiceAssembly.RootDir)%(Directory)%(FileName).pdb')" /> diff --git a/build/dependencies.props b/build/dependencies.props index cf7cadb19279789607f28e50defc87cadab8735a..983109a3be64330cc97e227a6a922d8b6247c173 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -51,16 +51,16 @@ <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion> <SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion> <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion> - <VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCommonPackageVersion> - <VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion> - <VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion> - <VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> - <VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion> - <VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion> - <VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion> - <VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion> - <VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion> - <VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.11.0-beta1-63430-03</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion> + <VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCommonPackageVersion> + <VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion> + <VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion> + <VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> + <VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion> + <VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion> + <VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion> + <VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion> + <VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion> + <VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion> <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion> <XunitPackageVersion>2.3.1</XunitPackageVersion> <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion> diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 91d56e97daa748facd2d22c856a5d47047120608..57203003a08397c6c063418b1dd034d4fbd8d396 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20181108.5 -commithash:dae1d0c39ad86505e53f3629665714313bfd0d7d +version:3.0.0-build-20181120.4 +commithash:84dcc6f0eb5455a3c0305d6d238926defb050889 diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj index c6b3d3e2124cc6e93366b593bd8513a1d0d1e6c8..0d61d12b26581143cdccf4364aba98d692dd398a 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description> - <TargetFrameworks>net46;netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags> <EnableApiCheck>false</EnableApiCheck> </PropertyGroup> diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj index 37eafe0684aa9992d5191d278c161591cc5e42bc..e77d4c38373945bdfde1f2f5b36288408aac9b9f 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description> - <TargetFrameworks>net46;netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags> </PropertyGroup> diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj index 845b3b434a4e6a22a57269cdfc43c09d8501085f..afa5ecd6799a43eee620d7ba0f40058bc0945c89 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description> - <TargetFrameworks>net46;netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags> </PropertyGroup> diff --git a/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj b/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj index 2cb75415c14a07fab029f12883b110da765887b7..1fd7aeebf5a97eaa500d9a1a9d4042adb29530f5 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj +++ b/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.</Description> - <TargetFrameworks>net46;netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/src/Microsoft.AspNetCore.Razor.Tools/Client.cs b/src/Microsoft.AspNetCore.Razor.Tools/Client.cs index 9378906d45382d5ee3d20b7d4e646696609952e7..cf94173337f99a12d2eba64ba2ea8a3a5bde159e 100644 --- a/src/Microsoft.AspNetCore.Razor.Tools/Client.cs +++ b/src/Microsoft.AspNetCore.Razor.Tools/Client.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.IO.Pipes; -#if NET46 +#if NETFRAMEWORK using System.Security.AccessControl; using System.Security.Principal; #endif @@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Razor.Tools ServerLogger.Log("Named pipe '{0}' connected", pipeName); cancellationToken.ThrowIfCancellationRequested(); -#if NET46 +#if NETFRAMEWORK // Verify that we own the pipe. if (!CheckPipeConnectionOwnership(stream)) { @@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Tools } } -#if NET46 +#if NETFRAMEWORK /// <summary> /// Check to ensure that the named pipe server we connected to is owned by the same /// user. diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj b/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj index 3a124ef7914652b7ea5b740668445a548affc7cf..7849c204396313823860ffd7734757b536deb6dc 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description> - <TargetFrameworks>net46;netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> <EnableApiCheck>false</EnableApiCheck> <DefineConstants>$(DefineConstants);DOCUMENT_SERVICE_FACTORY</DefineConstants> </PropertyGroup> diff --git a/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj b/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj index 4391fc3cdf6fda45e9eb63642e92546a84ca370a..e1efe71870d63ff480d57259366e78ea84e0006d 100644 --- a/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj +++ b/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description> - <TargetFrameworks>net46;netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> </PropertyGroup> <ItemGroup> @@ -13,9 +13,4 @@ <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" /> </ItemGroup> - - <ItemGroup Condition=" '$(TargetFramework)' == 'net46' "> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" /> - </ItemGroup> - </Project> diff --git a/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs b/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs index d0ec48f2b274c6b56c53fd93f94719881125f981..79694479a4bce6c81ce0ab721c6bcf3b2170c787 100644 --- a/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs +++ b/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks string commandLineCommands, out int result) { -#if !NET46 +#if !NETFRAMEWORK if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly)) { // For security reasons, we don't want to spin up a server that doesn't diff --git a/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj index 4f37e4b9561929928510a58969317d0d3ea0bee9..6f6d4be734daca6cffaa980e86e480b9e56d52fd 100644 --- a/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj @@ -65,35 +65,7 @@ <!-- Binaries that should be signed by corefx/roslyn --> <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\cs\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\de\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\es\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\fr\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\it\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ja\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ko\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pl\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pt-BR\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ru\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\tr\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hans\Microsoft.CodeAnalysis.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hant\Microsoft.CodeAnalysis.resources.dll" /> <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.CSharp.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\cs\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\de\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\es\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\fr\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\it\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ja\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ko\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pl\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\ru\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\tr\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\System.Collections.Immutable.dll" /> - <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\System.Reflection.Metadata.dll" /> <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" /> <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" /> </ItemGroup> diff --git a/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj b/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj index 3af8804777b873ccb9bfceb1b0b6e3fcbdebcd24..7ae2c1ff0ac65fe9fbbd87066bd790f2cbf8550a 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj +++ b/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net46</TargetFrameworks> + <TargetFrameworks>net472</TargetFrameworks> <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Visual Studio agnostic Razor design-time infrastructure.</Description> <EnableApiCheck>false</EnableApiCheck> </PropertyGroup> diff --git a/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj b/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj index 69e9071704ef428dda7c26df728061d863139967..b3c81528d1463b0574c9b317dcd0913f03dd737d 100644 --- a/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj +++ b/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net461</TargetFramework> + <TargetFramework>net472</TargetFramework> <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio for Mac.</Description> <EnableApiCheck>false</EnableApiCheck> </PropertyGroup> @@ -15,4 +15,8 @@ <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' "> + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" /> + </ItemGroup> + </Project> diff --git a/src/RazorPageGenerator/RazorPageGenerator.csproj b/src/RazorPageGenerator/RazorPageGenerator.csproj index 2668c16904b2653028ce7597c63a3870bb84017a..c7a690e4d6256e97f64e855325c87bd4bec69f4c 100644 --- a/src/RazorPageGenerator/RazorPageGenerator.csproj +++ b/src/RazorPageGenerator/RazorPageGenerator.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>Builds Razor pages for views in a project. For internal use only.</Description> - <TargetFramework>netcoreapp2.1</TargetFramework> + <TargetFramework>netcoreapp3.0</TargetFramework> <AssemblyName>dotnet-razorpagegenerator</AssemblyName> <PackageId>RazorPageGenerator</PackageId> <OutputType>Exe</OutputType> diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj index 57a0000191d8e6e545768e8cd5c337d7a68c92e9..feec4311800b554ea04a88f39fc58ff70159c37d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -1,8 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(DeveloperBuildTestTfms)</TargetFrameworks> - <TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net46</TargetFrameworks> + <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes> <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants> </PropertyGroup> diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs index 73f03f9e1ca19058cfa2b74cb8bcefcd8fbb273c..c42bb4ef91f5b79a838150931c94c8a334fcb58d 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs @@ -7,12 +7,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; -#if NET46 -using System.Runtime.Remoting; -using System.Runtime.Remoting.Messaging; -#else using System.Threading; -#endif using Microsoft.AspNetCore.Razor.Language.Legacy; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; @@ -28,9 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests [IntializeTestFile] public abstract class IntegrationTestBase { -#if !NET46 private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>(); -#endif private static readonly CSharpCompilation DefaultBaseCompilation; @@ -114,22 +107,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests // Used by the test framework to set the 'base' name for test files. public static string FileName { -#if NETFRAMEWORK - get - { - var handle = (ObjectHandle)CallContext.LogicalGetData("IntegrationTestBase_FileName"); - return (string)handle.Unwrap(); - } - set - { - CallContext.LogicalSetData("IntegrationTestBase_FileName", new ObjectHandle(value)); - } -#elif NETCOREAPP get { return _fileName.Value; } set { _fileName.Value = value; } -#else -#error Target frameworks need to be updated -#endif } public string FileExtension { get; set; } = ".cshtml"; diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs index 801a6dbb72ac16c807ca1e834e2b6b086fd7f888..1e88100c4660da4fb475ae81f696f2c5a2630a6a 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs @@ -8,12 +8,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; -#if NET46 -using System.Runtime.Remoting; -using System.Runtime.Remoting.Messaging; -#else using System.Threading; -#endif using System.Text; using Xunit; using Xunit.Sdk; @@ -24,10 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy [IntializeTestFile] public abstract class ParserTestBase { -#if !NET46 private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>(); private static readonly AsyncLocal<bool> _isTheory = new AsyncLocal<bool>(); -#endif internal ParserTestBase() { @@ -51,40 +44,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Used by the test framework to set the 'base' name for test files. public static string FileName { -#if NETFRAMEWORK - get - { - var handle = (ObjectHandle)CallContext.LogicalGetData("ParserTestBase_FileName"); - return (string)handle.Unwrap(); - } - set - { - CallContext.LogicalSetData("ParserTestBase_FileName", new ObjectHandle(value)); - } -#elif NETCOREAPP get { return _fileName.Value; } set { _fileName.Value = value; } -#else -#error Target frameworks need to be updated. -#endif } public static bool IsTheory { -#if NETFRAMEWORK - get - { - var handle = (ObjectHandle)CallContext.LogicalGetData("ParserTestBase_IsTheory"); - return (bool)handle.Unwrap(); - } - set - { - CallContext.LogicalSetData("ParserTestBase_IsTheory", new ObjectHandle(value)); - } -#elif NETCOREAPP get { return _isTheory.Value; } set { _isTheory.Value = value; } -#endif } protected int BaselineTestCount { get; set; } diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj index 418a3b82d1c9fa3fa3717e368ecda9cab1ed1d86..a68e6182b4224984981e6afd2bb7286ff5a964fa 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -4,7 +4,7 @@ <!-- To generate baselines, run tests with /p:GenerateBaselines=true --> <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants> <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants> - <TargetFrameworks>netcoreapp3.0;net46</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj index 9c2ffdd7e0e5b73f1af06cc39d538b1a178f80e7..3ea5cdf474ae61f0a3e83e26796fdf84fcc70842 100644 --- a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj +++ b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net46;netcoreapp3.0;$(StandardTestTfms)</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj b/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj index 18327289a457907955d9bcb621998ba0a66720c1..e165062bc53718b088109313b6283bdebdd0b4b4 100644 --- a/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj +++ b/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net46</TargetFrameworks> + <TargetFramework>net472</TargetFramework> </PropertyGroup> <ItemGroup> @@ -17,4 +17,8 @@ <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' "> + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" /> + </ItemGroup> + </Project> diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj b/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj index 0909a64e5caa6c2c038d28407aac08bc37deaa0e..112e7364808559cb2be8a51cee73d51d8877a2c2 100644 --- a/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj +++ b/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net461</TargetFramework> + <TargetFramework>net472</TargetFramework> <PreserveCompilationContext>true</PreserveCompilationContext> </PropertyGroup> @@ -36,4 +36,8 @@ <PackageReference Include="xunit" Version="$(XunitPackageVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' "> + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" /> + </ItemGroup> + </Project> diff --git a/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj b/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj index d0f3a281dfe5490f2e50c4bb384d3d0f9dd6a585..59efeb770dd3acc616fb345c2b51973afb8575ab 100644 --- a/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj +++ b/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net461</TargetFramework> + <TargetFramework>net472</TargetFramework> </PropertyGroup> <ItemGroup> @@ -30,4 +30,8 @@ <PackageReference Include="xunit" Version="$(XunitPackageVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' "> + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" /> + </ItemGroup> + </Project> diff --git a/test/testapps/Directory.Build.props b/test/testapps/Directory.Build.props index c0e194b7d3df643c951a38821d40166bc36e0d35..8020d32ee09f83a3abe023c78acbdcac06100e6d 100644 --- a/test/testapps/Directory.Build.props +++ b/test/testapps/Directory.Build.props @@ -20,6 +20,9 @@ <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion> <NETStandardImplicitPackageVersion>$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion> + + <!-- Working around an issue in XDT transforms --> + <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel> </PropertyGroup> <!-- Don't use the server when building in place. This locks up rzc.dll --> diff --git a/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj b/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj index 9f6462e3a7b489d31f57e4edf3e4567b7c8c19c7..9e27487228e1f28a801b191b8dab0001a9e81c63 100644 --- a/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj +++ b/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj @@ -2,7 +2,7 @@ <Import Project="AddinMetadata.props" /> <PropertyGroup> - <TargetFramework>net461</TargetFramework> + <TargetFramework>net472</TargetFramework> </PropertyGroup> <ItemGroup> @@ -41,6 +41,10 @@ <PackageReference Include="Mono.Addins" Version="$(MonoAddinsPackageVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' "> + <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" /> + </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Mac.LanguageServices.Razor\Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj" /> </ItemGroup> diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj index 41e756a7dd6c1b184a636ef3691a0032c84f5be6..7ef34bd712db347a9216fc60e5530e50a27df108 100644 --- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj +++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj @@ -273,9 +273,9 @@ </ItemDefinitionGroup> <ItemGroup> <VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Remote.Razor.dll" /> - <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" /> - <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" /> - <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" /> + <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" /> + <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" /> + <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" /> <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.AspNetCore.Razor.Language.dll" /> <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Razor.dll" /> <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />