diff --git a/README.md b/README.md index 2f2337a55..b528d9166 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ PerfView is developed in Visual Studio 2019 using features through C# 6. You will want to deploy the 'Release' rather than the 'Debug' version of PerfView. Thus, first set your build configuration to 'Release' (Text window in the top toolbar, or right click on the .SLN file -> Configuration Manager -> Active Solution Configuration). -Next build (Build -> Build Solution (Ctrl-Shift-B)). The result will be that in the src\perfView\bin\net45\Release directory there will be +Next build (Build -> Build Solution (Ctrl-Shift-B)). The result will be that in the src\perfView\bin\net462\Release directory there will be among other things a PerfView.exe. This one file is all you need to deploy. Simply copy it to where you wish to deploy the app. ### Information for build troubleshooting. diff --git a/src/CSVReader/CSVReader.csproj b/src/CSVReader/CSVReader.csproj index 09a1341da..9d0b30118 100644 --- a/src/CSVReader/CSVReader.csproj +++ b/src/CSVReader/CSVReader.csproj @@ -2,7 +2,7 @@ - net45 + net462 CSVReader Microsoft diff --git a/src/EtwClrProfilerSigning/EtwClrProfilerSigning.csproj b/src/EtwClrProfilerSigning/EtwClrProfilerSigning.csproj index 0fca9f298..65e16bf4e 100644 --- a/src/EtwClrProfilerSigning/EtwClrProfilerSigning.csproj +++ b/src/EtwClrProfilerSigning/EtwClrProfilerSigning.csproj @@ -5,7 +5,7 @@ library - net45 + net462 diff --git a/src/EtwHeapDump/EtwHeapDump.csproj b/src/EtwHeapDump/EtwHeapDump.csproj index 6dbea1880..fec6042a4 100644 --- a/src/EtwHeapDump/EtwHeapDump.csproj +++ b/src/EtwHeapDump/EtwHeapDump.csproj @@ -1,7 +1,7 @@  - net45 + net462 Microsoft.Diagnostics.EtwHeapDump Microsoft.Diagnostics.EtwHeapDump true diff --git a/src/FastSerialization/FastSerialization.csproj b/src/FastSerialization/FastSerialization.csproj index e4d4628b9..32ad0655f 100644 --- a/src/FastSerialization/FastSerialization.csproj +++ b/src/FastSerialization/FastSerialization.csproj @@ -2,7 +2,7 @@ - net45;netstandard1.3 + net462;netstandard1.3 Microsoft.Diagnostics.FastSerialization Microsoft.Diagnostics.FastSerialization true diff --git a/src/HeapDump/HeapDump.csproj b/src/HeapDump/HeapDump.csproj index 06afde407..f8e80cb08 100644 --- a/src/HeapDump/HeapDump.csproj +++ b/src/HeapDump/HeapDump.csproj @@ -2,7 +2,7 @@ - net45 + net462 AnyCPU;x64 Exe true diff --git a/src/HeapDumpDLL/HeapDumpDLL.csproj b/src/HeapDumpDLL/HeapDumpDLL.csproj index 0e2bd3f11..34fd00372 100644 --- a/src/HeapDumpDLL/HeapDumpDLL.csproj +++ b/src/HeapDumpDLL/HeapDumpDLL.csproj @@ -2,7 +2,7 @@ - net45 + net462 Microsoft.Diagnostics.HeapDump Microsoft.Diagnostics.HeapDump true diff --git a/src/LinuxEvent.Tests/LinuxTracing.Tests.csproj b/src/LinuxEvent.Tests/LinuxTracing.Tests.csproj index dece5757e..cd77d11df 100644 --- a/src/LinuxEvent.Tests/LinuxTracing.Tests.csproj +++ b/src/LinuxEvent.Tests/LinuxTracing.Tests.csproj @@ -2,7 +2,7 @@ - net46 + net462 true Unit tests. Copyright © Microsoft 2016 diff --git a/src/MemoryGraph/MemoryGraph.csproj b/src/MemoryGraph/MemoryGraph.csproj index 0b73484d3..153dd14b3 100644 --- a/src/MemoryGraph/MemoryGraph.csproj +++ b/src/MemoryGraph/MemoryGraph.csproj @@ -2,7 +2,7 @@ - net45;netstandard2.0 + net462;netstandard2.0 Microsoft.Diagnostics.MemoryGraph Microsoft.Diagnostics.MemoryGraph true diff --git a/src/PerfView.TestUtilities/PerfView.TestUtilities.csproj b/src/PerfView.TestUtilities/PerfView.TestUtilities.csproj index e671bafa7..2d006b850 100644 --- a/src/PerfView.TestUtilities/PerfView.TestUtilities.csproj +++ b/src/PerfView.TestUtilities/PerfView.TestUtilities.csproj @@ -2,7 +2,7 @@ - net46 + net462 Unit test utility library. Copyright © Microsoft 2017 diff --git a/src/PerfView.Tests/PerfView.Tests.csproj b/src/PerfView.Tests/PerfView.Tests.csproj index 7d432d180..e0825255b 100644 --- a/src/PerfView.Tests/PerfView.Tests.csproj +++ b/src/PerfView.Tests/PerfView.Tests.csproj @@ -2,7 +2,7 @@ - net46 + net462 PerfViewTests PerfViewTests Unit tests for PerfView. diff --git a/src/PerfView/PerfView.csproj b/src/PerfView/PerfView.csproj index 5359bb138..ac1ba0ba7 100644 --- a/src/PerfView/PerfView.csproj +++ b/src/PerfView/PerfView.csproj @@ -2,7 +2,7 @@ - net45 + net462 WinExe True PerfView.App @@ -241,14 +241,14 @@ amd64\vcruntime140_1.dll False - + Non-Resx false .\amd64\HeapDump.exe amd64\HeapDump.exe False - + Non-Resx false .\amd64\HeapDump.exe.config @@ -263,14 +263,14 @@ False - + Non-Resx false .\x86\EtwClrProfiler.dll x86\EtwClrProfiler.dll False - + Non-Resx false .\amd64\EtwClrProfiler.dll diff --git a/src/PerfViewCollect/PerfViewCollect.csproj b/src/PerfViewCollect/PerfViewCollect.csproj index f5ba86892..a27516d8f 100644 --- a/src/PerfViewCollect/PerfViewCollect.csproj +++ b/src/PerfViewCollect/PerfViewCollect.csproj @@ -76,14 +76,14 @@ - - - + + + - - - + + + - - - + + + diff --git a/src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props b/src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props index c0cb9d1f4..0d28136df 100644 --- a/src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props +++ b/src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props @@ -99,7 +99,7 @@ PreserveNewest False - + OSExtensions.dll PreserveNewest False diff --git a/src/TraceEvent/Samples/TraceEventSamples.csproj b/src/TraceEvent/Samples/TraceEventSamples.csproj index 4ca883e3c..4dfe57863 100644 --- a/src/TraceEvent/Samples/TraceEventSamples.csproj +++ b/src/TraceEvent/Samples/TraceEventSamples.csproj @@ -3,7 +3,7 @@ Exe - net45 + net462 Microsoft TraceEvent Samples diff --git a/src/TraceEvent/Samples/packages.config b/src/TraceEvent/Samples/packages.config index 6f5ab38b0..b4012efab 100644 --- a/src/TraceEvent/Samples/packages.config +++ b/src/TraceEvent/Samples/packages.config @@ -1,11 +1,11 @@  - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/src/TraceEvent/Stacks/StackSourceWriterHelper.cs b/src/TraceEvent/Stacks/StackSourceWriterHelper.cs index 7b943f963..560059207 100644 --- a/src/TraceEvent/Stacks/StackSourceWriterHelper.cs +++ b/src/TraceEvent/Stacks/StackSourceWriterHelper.cs @@ -239,7 +239,7 @@ internal static string GetEscaped(string name, Dictionary escape .GetType("System.Web.HttpUtility, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a") .GetMethod("JavaScriptStringEncode", new Type[1] { typeof(string) }) .Invoke(null, new object[] { name }); -#elif NETSTANDARD2_0 || NET45 +#elif NETSTANDARD2_0 || NET462 escaped = escapedNames[name] = System.Web.HttpUtility.JavaScriptStringEncode(name); #endif } diff --git a/src/TraceEvent/TraceEvent.Tests/TraceEvent.Tests.csproj b/src/TraceEvent/TraceEvent.Tests/TraceEvent.Tests.csproj index 33d3bdbeb..62adb356b 100644 --- a/src/TraceEvent/TraceEvent.Tests/TraceEvent.Tests.csproj +++ b/src/TraceEvent/TraceEvent.Tests/TraceEvent.Tests.csproj @@ -2,7 +2,7 @@ - net46 + net462 TraceEventTests TraceEventTests Unit tests for TraceEvent. diff --git a/src/TraceEvent/TraceEvent.csproj b/src/TraceEvent/TraceEvent.csproj index 19be869fc..6260db04c 100644 --- a/src/TraceEvent/TraceEvent.csproj +++ b/src/TraceEvent/TraceEvent.csproj @@ -2,7 +2,7 @@ - net45;netstandard1.6;netstandard2.0 + net462;netstandard1.6;netstandard2.0 @@ -40,8 +40,8 @@ @@ -58,7 +58,7 @@ - + @@ -196,7 +196,7 @@ diff --git a/src/TraceEventPackageSigning/TraceEventPackageSigning.csproj b/src/TraceEventPackageSigning/TraceEventPackageSigning.csproj index 6494eba3d..d09e48289 100644 --- a/src/TraceEventPackageSigning/TraceEventPackageSigning.csproj +++ b/src/TraceEventPackageSigning/TraceEventPackageSigning.csproj @@ -9,7 +9,7 @@ library - net45 + net462 diff --git a/src/TraceParserGen/TraceParserGen.csproj b/src/TraceParserGen/TraceParserGen.csproj index 3a26efe68..6a356352b 100644 --- a/src/TraceParserGen/TraceParserGen.csproj +++ b/src/TraceParserGen/TraceParserGen.csproj @@ -2,7 +2,7 @@ - net40 + net462 Exe TraceParserGen diff --git a/src/Utilities/Utilities.csproj b/src/Utilities/Utilities.csproj index 5c62f7c82..80dd6b78a 100644 --- a/src/Utilities/Utilities.csproj +++ b/src/Utilities/Utilities.csproj @@ -2,7 +2,7 @@ - net45;netstandard2.0 + net462;netstandard2.0 Microsoft.Diagnostics.Utilities Microsoft.Diagnostics.Utilities true