diff --git a/eng/DiaSymReaderNative.targets b/eng/DiaSymReaderNative.targets index 2fe022618..87b0a1cc5 100644 --- a/eng/DiaSymReaderNative.targets +++ b/eng/DiaSymReaderNative.targets @@ -1,6 +1,4 @@ - - - + - - + + + - + + diff --git a/eng/Versions.props b/eng/Versions.props index 84c7df36d..08d5271a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - - + 1.1.0 beta2 true true true + 4.1.0-1.21523.2 4.1.0-1.21523.2 @@ -20,4 +20,5 @@ 5.0.0 5.0.0 + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 580912f1d..edeb2837a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,12 +1,14 @@ - - - + + - Preview + preview annotations - enable MIT + + net8.0 + net472 + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index b03b60765..1ad64f763 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,30 +1,9 @@ - - - + + - - <_ProjectDefinedPackageId>$(PackageId) - *fake_packageid_for_project_$(MSBuildProjectName)* - $(BeforePack);_UpdatePackageId + enable - - - - $(_ProjectDefinedPackageId) - $(AssemblyName) - $(MSBuildProjectName) - - diff --git a/src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj b/src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj index 4fb00fd36..4bfdd80eb 100644 --- a/src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj +++ b/src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj @@ -1,16 +1,15 @@ - - - + + - $(NetCurrent);net472 + $(BundledNETCoreAppTargetFramework);$(NetFrameworkMinimum) true - x64;x86 - + x64;x86 + @@ -21,4 +20,5 @@ + diff --git a/src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj b/src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj index 083912257..7c31a1002 100644 --- a/src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj +++ b/src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj @@ -1,8 +1,7 @@ - - - + + - net6.0;net472 + $(NetMinimum);$(NetFrameworkMinimum) Microsoft.DiaSymReader.Tools true true @@ -16,6 +15,7 @@ false + @@ -23,6 +23,7 @@ + @@ -32,6 +33,7 @@ + @@ -45,4 +47,5 @@ %(NuGetPackageId)\%(Link) + diff --git a/src/Microsoft.DiaSymReader.Converter.Xml/Token2SourceLineExporter.cs b/src/Microsoft.DiaSymReader.Converter.Xml/Token2SourceLineExporter.cs index d05289b94..097fb1e5c 100644 --- a/src/Microsoft.DiaSymReader.Converter.Xml/Token2SourceLineExporter.cs +++ b/src/Microsoft.DiaSymReader.Converter.Xml/Token2SourceLineExporter.cs @@ -77,7 +77,11 @@ internal byte[] Buffer internal void FillBuffer(Stream stream, int capacity) { MinCapacity(capacity); +#if NET + stream.ReadExactly(_buffer, 0, capacity); +#else stream.Read(_buffer, 0, capacity); +#endif _offset = 0; } @@ -90,7 +94,11 @@ internal void Append(Stream stream, int count) Array.Copy(_buffer, newBuffer, _buffer.Length); _buffer = newBuffer; } +#if NET + stream.ReadExactly(_buffer, _offset, count); +#else stream.Read(_buffer, _offset, count); +#endif _offset += count; } @@ -389,14 +397,14 @@ private static int GetPrime(int minSize) // The hash table data. // This cannot be serialized - private struct bucket + private struct Bucket { internal int key; internal int hash_coll; // Store hash code; sign bit means there was a collision. - internal Object val; + internal object val; } - private bucket[] _buckets; + private Bucket[] _buckets; // The total number of entries in the hash table. private int _count; @@ -428,7 +436,7 @@ internal IntHashTable(int capacity, int loadFactorPerc) _loadFactorPerc = (loadFactorPerc * 72) / 100; int hashsize = GetPrime((int)(capacity / _loadFactorPerc)); - _buckets = new bucket[hashsize]; + _buckets = new Bucket[hashsize]; _loadsize = (int)(_loadFactorPerc * hashsize) / 100; if (_loadsize >= hashsize) @@ -466,11 +474,11 @@ internal Object this[int key] uint seed; uint incr; // Take a snapshot of buckets, in case another thread does a resize - bucket[] lbuckets = _buckets; + Bucket[] lbuckets = _buckets; uint hashcode = InitHash(key, lbuckets.Length, out seed, out incr); int ntry = 0; - bucket b; + Bucket b; do { int bucketNumber = (int)(seed % (uint)lbuckets.Length); @@ -513,13 +521,13 @@ private void rehash(int newsize) // at all times // 2) Protect against an OutOfMemoryException while allocating this // new bucket[]. - bucket[] newBuckets = new bucket[newsize]; + Bucket[] newBuckets = new Bucket[newsize]; // rehash table into new buckets int nb; for (nb = 0; nb < _buckets.Length; nb++) { - bucket oldb = _buckets[nb]; + Bucket oldb = _buckets[nb]; if (oldb.val != null) { putEntry(newBuckets, oldb.key, oldb.val, oldb.hash_coll & 0x7FFFFFFF); @@ -646,7 +654,7 @@ private void Insert(int key, Object nvalue, bool add) throw new InvalidOperationException("InvalidOperation_HashInsertFailed"); } - private void putEntry(bucket[] newBuckets, int key, Object nvalue, int hashcode) + private void putEntry(Bucket[] newBuckets, int key, Object nvalue, int hashcode) { uint seed = (uint)hashcode; uint incr = (uint)(1 + (((seed >> 5) + 1) % ((uint)newBuckets.Length - 1))); @@ -867,7 +875,11 @@ internal void Seek(int page, int offset) internal void Read(byte[] bytes, int offset, int count) { +#if NET + reader.ReadExactly(bytes, offset, count); +#else reader.Read(bytes, offset, count); +#endif } internal int PagesFromSize(int size) diff --git a/src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj b/src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj index 353ab2bf6..4bee6f594 100644 --- a/src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj +++ b/src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj @@ -1,8 +1,7 @@ - - - + + - net6.0;net472 + $(NetMinimum);$(NetFrameworkMinimum) Microsoft.DiaSymReader.Tools true true @@ -17,6 +16,7 @@ false + @@ -27,10 +27,12 @@ + + @@ -43,4 +45,5 @@ %(NuGetPackageId)\%(Link) + diff --git a/src/Microsoft.DiaSymReader.Converter/Utilities/SymReaderHelpers.cs b/src/Microsoft.DiaSymReader.Converter/Utilities/SymReaderHelpers.cs index 0b514ea9a..e9e5a1b8c 100644 --- a/src/Microsoft.DiaSymReader.Converter/Utilities/SymReaderHelpers.cs +++ b/src/Microsoft.DiaSymReader.Converter/Utilities/SymReaderHelpers.cs @@ -116,11 +116,7 @@ private unsafe static byte[] GetBytes(byte* data, int size) } private unsafe static string GetString(byte* data, int size) => -#if NET45 - new string((sbyte*)data, 0, size, Encoding.UTF8); -#else Encoding.UTF8.GetString(data, size); -#endif public unsafe static string? GetSourceLinkData(this ISymUnmanagedReader5 reader) => TryGetSourceLinkData(reader, out byte* data, out int size) ? GetString(data, size) : null; diff --git a/src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj b/src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj index fa48a4690..8210bf3ad 100644 --- a/src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj +++ b/src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj @@ -1,10 +1,10 @@ - - - + + - net472 + $(NetFrameworkMinimum) true + @@ -14,4 +14,5 @@ + diff --git a/src/Pdb2Pdb/Pdb2Pdb.csproj b/src/Pdb2Pdb/Pdb2Pdb.csproj index a04f4fa4a..d10e8ac2f 100644 --- a/src/Pdb2Pdb/Pdb2Pdb.csproj +++ b/src/Pdb2Pdb/Pdb2Pdb.csproj @@ -1,8 +1,7 @@ - - - + + - net472 + $(NetFrameworkMinimum) Microsoft.DiaSymReader.Tools Exe true @@ -16,19 +15,24 @@ $(OutputPath) true + + + + + diff --git a/src/Pdb2Xml/Pdb2Xml.csproj b/src/Pdb2Xml/Pdb2Xml.csproj index 54ca533ac..4a455dc92 100644 --- a/src/Pdb2Xml/Pdb2Xml.csproj +++ b/src/Pdb2Xml/Pdb2Xml.csproj @@ -1,8 +1,7 @@ - - - + + - net472 + $(NetFrameworkMinimum) Microsoft.DiaSymReader.Tools Exe true @@ -15,15 +14,19 @@ Pdb2Xml.nuspec $(OutputPath) + + + + diff --git a/src/PdbTestResources/PdbTestResources.csproj b/src/PdbTestResources/PdbTestResources.csproj index c9c7e20ad..58fef655d 100644 --- a/src/PdbTestResources/PdbTestResources.csproj +++ b/src/PdbTestResources/PdbTestResources.csproj @@ -1,16 +1,17 @@ - - - + + netstandard2.0 false + + Async.dll @@ -175,4 +176,5 @@ CrossGen.dllx + diff --git a/src/TestUtilities/TestUtilities.csproj b/src/TestUtilities/TestUtilities.csproj index 30a15f672..0e9181c27 100644 --- a/src/TestUtilities/TestUtilities.csproj +++ b/src/TestUtilities/TestUtilities.csproj @@ -1,13 +1,14 @@ - - - + + - net7.0;net472 + $(NetMinimum);$(NetFrameworkMinimum) false + +