diff --git a/.props/_Nupkg.props b/.props/_Nupkg.props index 4aec5a50f7..77c30445c6 100644 --- a/.props/_Nupkg.props +++ b/.props/_Nupkg.props @@ -11,6 +11,7 @@ True True snupkg + true diff --git a/.scripts/release_NupkgAudit.ps1 b/.scripts/release_NupkgAudit.ps1 index c22d413697..6718b16986 100644 --- a/.scripts/release_NupkgAudit.ps1 +++ b/.scripts/release_NupkgAudit.ps1 @@ -149,6 +149,22 @@ function Get-DoesXmlDocExist ([string]$dllPath) { Test-Condition (Test-Path $docFile) $message $requirement; } +function Get-DoesXmlDocContainsLang ([string]$dllPath) { + # CONFIRM .XML DOCUMENTATION FILE EXISTS WITH EACH DLL + [string]$docFile = $dllPath -replace ".dll", ".xml"; + + [bool]$result = $false; + [string]$searchString = ''; + + if (Test-Path $docFile) { + $result = select-string -path $docFile -Pattern $searchString -Quiet; + } + + $message = "XML Documentation:"; + $requirement = "Must contain xml:lang='en' "; + Test-Condition ($result) $message $requirement; +} + function Get-DoesDllVersionsMatch ([string]$dllPath) { # CONFIRM Assembly version matches File version [string]$fileVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($dllPath).FileVersion; @@ -323,6 +339,7 @@ function Start-EvaluateNupkg ($nupkgPath) { Get-DoesDllVersionsMatch $_.FullName; Get-DoesXmlDocExist $_.FullName; + Get-DoesXmlDocContainsLang $_.FullName; } } diff --git a/.targets/AddXmlLanguage.targets b/.targets/AddXmlLanguage.targets index 00c613de89..cbc8ed2563 100644 --- a/.targets/AddXmlLanguage.targets +++ b/.targets/AddXmlLanguage.targets @@ -1,17 +1,11 @@ - - - - - - + - @@ -19,62 +13,25 @@ Not sure where the requirement of xml:lang="en" came from. But to address it - hacking is the only way now: https://social.msdn.microsoft.com/forums/en-us/70b984eb-f490-4494-8fbc-12fe4a62e5e4/xmllang-on-doc-for-xml-doc-comments?forum=xmlandnetfx --> - - f.ItemSpec)) - { - Log.LogMessage("Fixing {0}", inputFilePath); - string filePath = inputFilePath; - if (filePath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - filePath = filePath.Substring(0, filePath.Length - 3) + "xml"; - } - - if (filePath.EndsWith(".xml", StringComparison.OrdinalIgnoreCase)) - { - string[] files = null; - int starIndex = filePath.IndexOf('*'); - if (starIndex >= 0) - { - string dir = filePath.Substring(0, starIndex); - if (string.IsNullOrEmpty(dir)) - { - dir = "."; - } + {0}", FilePath); - string file = Path.GetFileName(filePath.Substring(starIndex)); - files = Directory.GetFiles(dir, file, SearchOption.AllDirectories); - } - else - { - files = new[] { filePath }; - } - - foreach (string fileName in files) - { - if (File.Exists(fileName)) - { - Log.LogMessage("Processing XML: {0}", fileName); - string text = File.ReadAllText(fileName); - text = text.Replace("", ""); - File.WriteAllText(fileName, text); - } - } - } + if (File.Exists(FilePath)) + { + string text = File.ReadAllText(FilePath); + text = text.Replace("", ""); + File.WriteAllText(FilePath, text); + } + else + { + Log.LogError("InjectXmlLanguage: Assembly XML Doc file not found in bin folder."); } - ]]> - + ]]> - + - - - - - \ No newline at end of file diff --git a/BASE/AddXmlLanguage.targets b/BASE/AddXmlLanguage.targets deleted file mode 100644 index 264d66b21a..0000000000 --- a/BASE/AddXmlLanguage.targets +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - f.ItemSpec)) - { - Log.LogMessage("Fixing {0}", inputFilePath); - string filePath = inputFilePath; - if (filePath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - filePath = filePath.Substring(0, filePath.Length - 3) + "xml"; - } - - if (filePath.EndsWith(".xml", StringComparison.OrdinalIgnoreCase)) - { - string[] files = null; - int starIndex = filePath.IndexOf('*'); - if (starIndex >= 0) - { - string dir = filePath.Substring(0, starIndex); - if (string.IsNullOrEmpty(dir)) - { - dir = "."; - } - - string file = Path.GetFileName(filePath.Substring(starIndex)); - files = Directory.GetFiles(dir, file, SearchOption.AllDirectories); - } - else - { - files = new[] { filePath }; - } - - foreach (string fileName in files) - { - if (File.Exists(fileName)) - { - Log.LogMessage("Processing XML: {0}", fileName); - string text = File.ReadAllText(fileName); - text = text.Replace("", ""); - File.WriteAllText(fileName, text); - } - } - } - } - ]]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BASE/Common.props b/BASE/Common.props index 82027d0fbd..5855804bd2 100644 --- a/BASE/Common.props +++ b/BASE/Common.props @@ -37,7 +37,4 @@ true $(DefineConstants);TRACE - - $(TargetsForTfmSpecificBuildOutput);AddXmlDocToNugetPackage - diff --git a/BASE/Common.targets b/BASE/Common.targets index 02afb6a18a..c6ad514207 100644 --- a/BASE/Common.targets +++ b/BASE/Common.targets @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/BASE/src/Microsoft.ApplicationInsights/Product.props b/BASE/src/Microsoft.ApplicationInsights/Product.props index 0a4c3d3d33..4d3c19bc4c 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Product.props +++ b/BASE/src/Microsoft.ApplicationInsights/Product.props @@ -11,6 +11,5 @@ Microsoft.ApplicationInsights $(RootNamespace) - $(OutputPath)\$(TargetFramework)\$(AssemblyName).XML diff --git a/BASE/src/ServerTelemetryChannel/Product.props b/BASE/src/ServerTelemetryChannel/Product.props index 1b689c569c..644d7db06f 100644 --- a/BASE/src/ServerTelemetryChannel/Product.props +++ b/BASE/src/ServerTelemetryChannel/Product.props @@ -11,6 +11,5 @@ Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel Microsoft.AI.ServerTelemetryChannel - $(OutputPath)\$(TargetFramework)\$(AssemblyName).XML diff --git a/LOGGING/AddXmlLanguage.targets b/LOGGING/AddXmlLanguage.targets deleted file mode 100644 index 2de2f74575..0000000000 --- a/LOGGING/AddXmlLanguage.targets +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - f.ItemSpec)) - { - Log.LogMessage("Fixing {0}", inputFilePath); - string filePath = inputFilePath; - if (filePath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - filePath = filePath.Substring(0, filePath.Length - 3) + "xml"; - } - - if (filePath.EndsWith(".xml", StringComparison.OrdinalIgnoreCase)) - { - string[] files = null; - int starIndex = filePath.IndexOf('*'); - if (starIndex >= 0) - { - string dir = filePath.Substring(0, starIndex); - if (string.IsNullOrEmpty(dir)) - { - dir = "."; - } - - string file = Path.GetFileName(filePath.Substring(starIndex)); - files = Directory.GetFiles(dir, file, SearchOption.AllDirectories); - } - else - { - files = new[] { filePath }; - } - - foreach (string fileName in files) - { - if (File.Exists(fileName)) - { - Log.LogMessage("Processing XML: {0}", fileName); - string text = File.ReadAllText(fileName); - text = text.Replace("", ""); - File.WriteAllText(fileName, text); - } - } - } - } - ]]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LOGGING/Common.props b/LOGGING/Common.props index 475ad2bb8f..8ac5d90c18 100644 --- a/LOGGING/Common.props +++ b/LOGGING/Common.props @@ -24,7 +24,4 @@ $(DefineConstants);TRACE - - $(TargetsForTfmSpecificBuildOutput);AddXmlDocToNugetPackage - \ No newline at end of file diff --git a/LOGGING/Common.targets b/LOGGING/Common.targets index 02afb6a18a..c6ad514207 100644 --- a/LOGGING/Common.targets +++ b/LOGGING/Common.targets @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/LOGGING/src/Product.props b/LOGGING/src/Product.props index 47ab6ee1e1..a0f1356f19 100644 --- a/LOGGING/src/Product.props +++ b/LOGGING/src/Product.props @@ -11,9 +11,4 @@ $([System.IO.Path]::GetFullPath( $(OutputPath) ))\ - - $(OutputPath)\$(TargetFramework)\$(AssemblyName).XML - true - - diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index 7cf2b5ffec..0f951fc15a 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -19,11 +19,6 @@ $(PackageTags)aspnetcore; - - - true - - full @@ -112,4 +107,5 @@ + diff --git a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj index 7f169d4929..239db9b2a8 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj +++ b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj @@ -18,11 +18,6 @@ $(PackageTags)worker;console;backgroundtasks; - - - true - - full @@ -88,4 +83,6 @@ + + diff --git a/WEB/AddXmlLanguage.targets b/WEB/AddXmlLanguage.targets deleted file mode 100644 index f6588f01e1..0000000000 --- a/WEB/AddXmlLanguage.targets +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - f.ItemSpec)) - { - Log.LogMessage("Fixing {0}", inputFilePath); - string filePath = inputFilePath; - if (filePath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - filePath = filePath.Substring(0, filePath.Length - 3) + "xml"; - } - - if (filePath.EndsWith(".xml", StringComparison.OrdinalIgnoreCase)) - { - string[] files = null; - int starIndex = filePath.IndexOf('*'); - if (starIndex >= 0) - { - string dir = filePath.Substring(0, starIndex); - if (string.IsNullOrEmpty(dir)) - { - dir = "."; - } - - string file = Path.GetFileName(filePath.Substring(starIndex)); - files = Directory.GetFiles(dir, file, SearchOption.AllDirectories); - } - else - { - files = new[] { filePath }; - } - - foreach (string fileName in files) - { - if (File.Exists(fileName)) - { - Log.LogMessage("Processing XML: {0}", fileName); - string text = File.ReadAllText(fileName); - text = text.Replace("", ""); - File.WriteAllText(fileName, text); - } - } - } - } - ]]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WEB/Common.props b/WEB/Common.props index 777a40542e..389d63db0a 100644 --- a/WEB/Common.props +++ b/WEB/Common.props @@ -65,7 +65,4 @@ - - $(TargetsForTfmSpecificBuildOutput);AddXmlDocToNugetPackage - diff --git a/WEB/Common.targets b/WEB/Common.targets index ab3832add3..f02b2627c7 100644 --- a/WEB/Common.targets +++ b/WEB/Common.targets @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj index 9f6b9a9233..b444b88a0f 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj +++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj @@ -4,7 +4,6 @@ Microsoft.ApplicationInsights.DependencyCollector Microsoft.AI.DependencyCollector - $(OutputPath)\$(AssemblyName).XML net45;netstandard1.6;netstandard2.0 netstandard1.6;netstandard2.0 false diff --git a/WEB/Src/DependencyCollector/NetCore.Tests/DependencyCollector.NetCore.Tests.csproj b/WEB/Src/DependencyCollector/NetCore.Tests/DependencyCollector.NetCore.Tests.csproj index c43d3344fd..9cd248ca60 100644 --- a/WEB/Src/DependencyCollector/NetCore.Tests/DependencyCollector.NetCore.Tests.csproj +++ b/WEB/Src/DependencyCollector/NetCore.Tests/DependencyCollector.NetCore.Tests.csproj @@ -4,7 +4,6 @@ netcoreapp2.1 - true Microsoft.ApplicationInsights.DependencyCollector.NetCore.Tests Microsoft.AI.DependencyCollector.Tests true diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj index f0d103b32a..944a1e6fb9 100644 --- a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj +++ b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj @@ -4,7 +4,6 @@ Microsoft.ApplicationInsights.Extensibility.EventCounterCollector Microsoft.AI.EventCounterCollector - $(OutputPath)\$(AssemblyName).XML netstandard2.0 diff --git a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj index 39fce1a5d3..328ebcc4f3 100644 --- a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj +++ b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj @@ -4,7 +4,6 @@ Microsoft.ApplicationInsights.Extensibility.HostingStartup Microsoft.AspNet.ApplicationInsights.HostingStartup - $(OutputPath)\$(AssemblyName).XML net45 false $(DefineConstants);ALLOW_AGGRESSIVE_INLIGNING_ATTRIBUTE diff --git a/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj b/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj index 29886ca5a6..f7710b1319 100644 --- a/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj +++ b/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj @@ -4,7 +4,6 @@ netcoreapp1.0 - true Microsoft.AI.PerformanceCollector.NetCore.Tests Microsoft.AI.DependencyCollector.Tests true diff --git a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj b/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj index e2673ceda4..2a99cc2cf6 100644 --- a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj +++ b/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj @@ -4,7 +4,6 @@ netcoreapp2.0 - true Microsoft.AI.PerformanceCollector.NetCore20.Tests Microsoft.AI.PerformanceCollector.Tests true diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj index b8c2e94775..799a24b98f 100644 --- a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj @@ -4,7 +4,6 @@ Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector Microsoft.AI.PerfCounterCollector - $(OutputPath)\$(AssemblyName).XML net45;netstandard1.6;netstandard2.0 netstandard1.6;netstandard2.0 diff --git a/WEB/Src/Web/Web/Web.csproj b/WEB/Src/Web/Web/Web.csproj index 85f7ea2c6f..e8444e62bf 100644 --- a/WEB/Src/Web/Web/Web.csproj +++ b/WEB/Src/Web/Web/Web.csproj @@ -4,7 +4,6 @@ Microsoft.ApplicationInsights.Web Microsoft.AI.Web - $(OutputPath)\$(AssemblyName).XML net45 false $(DefineConstants);ALLOW_AGGRESSIVE_INLIGNING_ATTRIBUTE diff --git a/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj b/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj index a19401f487..0d123c6d99 100644 --- a/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj +++ b/WEB/Src/WindowsServer/WindowsServer.NetCore.Tests/WindowsServer.NetCore.Tests.csproj @@ -3,7 +3,6 @@ - true Microsoft.AI.WindowsServer.NetCore.Tests Microsoft.AI.WindowsServer.NetCore.Tests true diff --git a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj index c5750c917b..c37dd271a9 100644 --- a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj +++ b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj @@ -4,7 +4,6 @@ Microsoft.ApplicationInsights.WindowsServer Microsoft.AI.WindowsServer - $(OutputPath)\$(AssemblyName).XML net45;netstandard1.6;netstandard2.0 netstandard1.6;netstandard2.0