Skip to content

Commit c0e157c

Browse files
gewarrengewarren
authored
Merge pull request #11165 from dotnet/main
Merge main into live
2 parents 61b87f7 + 4855510 commit c0e157c

File tree

56 files changed

+2154
-2777
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2154
-2777
lines changed

‎snippets/cpp/VS_Snippets_CLR/Cryptography.3DESCSP.CreateEncryptor.File/CPP/fileexample.cpp

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎snippets/cpp/VS_Snippets_CLR/Cryptography.3DESCSP.CreateEncryptor.Memory/CPP/memoryexample.cpp

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎snippets/cpp/VS_Snippets_CLR_Classic/classic TripleDESCryptoServiceProvider Example/CPP/source.cpp

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎snippets/cpp/VS_Snippets_CLR_System/system.Globalization.CompareOptions.StringSort/CPP/compareoptions_stringsort.cpp

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎snippets/csharp/System.Globalization/CompareOptions/Overview/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CompareOptionsExample.Run();
2+
StringSort.Run();

‎snippets/csharp/System.Globalization/CompareOptions/Overview/Project.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77

88
</Project>

0 commit comments

Comments
 (0)